AUTOMATED - git apply results

2024-04-03 16:00:15 +00:00 · 2024-04-03 15:57:51 +00:00
702 changed files with 210011 additions and 52453 deletions
@@ -22,6 +22,8 @@ body:
          required: true
        - label: "I have searched the existing issues for my problem. This is a new ticket, NOT a duplicate or related to another open issue."
          required: true
+        - label: "I have read the [FAQs](https://github.com/uazo/cromite/blob/master/FAQ.md)."
+          required: true
        - label: "I have updated Cromite to the latest version. The bug is reproducible on this latest version."
          required: true
        - label: "This is a bug report about the Cromite browser; not the website nor F-Droid nor anything else."
@@ -24,6 +24,8 @@ body:
      options:
        - label: "I have read the [README](https://github.com/uazo/cromite/blob/master/README.md)"
          required: true
+        - label: "I have read the [FAQs](https://github.com/uazo/cromite/blob/master/FAQ.md)."
+          required: true
        - label: "I have searched [existing issues](https://github.com/uazo/cromite/issues) for my feature request. This is a new issue (NOT a duplicate) and is not related to another issue."
          required: true
        - label: "I have searched [wont fix issues](https://github.com/uazo/cromite/issues?q=label%3Awontfix) and this request is not among them"
@@ -48,7 +48,7 @@ jobs:

      - name: Enable proxy on container
        shell: bash
-        if: ${{ github.event.inputs.type != '' && github.event.inputs.type != 'ubuntu-latest' }}
+        if: ${{ github.event.inputs.type != 'ubuntu-latest' }}
        run: |
          if ! [[ -z "${HTTP_PROXY}" ]]; then
            PROXY_ADDR=http://$(hostname -I | cut -d' ' -f1 | xargs):8118
@@ -156,15 +156,15 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
          path: cromite
          add-paths: |
            tools/under-control/*
-          commit-message: '[AUTO][FILECONTROL] - version ${{ env.NEW_VERSION }}'
-          title: '[AUTO][FILECONTROL] - version ${{ env.NEW_VERSION }}'
+          commit-message: 'AUTOMATED - new files under control ${{ env.NEW_VERSION }}'
+          title: New files under control ${{ env.NEW_VERSION }}
          body: ${{ env.MESSAGE }}
          delete-branch: true
          branch-suffix: short-commit-hash
@@ -180,10 +180,8 @@ jobs:
          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 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
@@ -191,7 +189,7 @@ jobs:
          fi

          if [[ "$LATEST_ANDROID" == "$CHR_VERSION" ]]; then
-             echo Using Android Release >body.txt
+             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
@@ -397,7 +397,7 @@ jobs:
          gn args out/lin64/ --list >out/lin64/gn_list
          echo "::endgroup::"

-          ninja -C out/lin64 chrome chrome_sandbox
+          ninja -C out/lin64 chrome

          cp ../../cromite/build/RELEASE out/lin64

@@ -138,7 +138,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -147,8 +147,8 @@ jobs:
          #push-to-fork: uazo/cromite
          add-paths: |
            build/patches/*.patch
-          commit-message: '[AUTO] Patches auto-rebase'
-          title: '[AUTO] Patches auto-rebase for ${{ env.BRANCH }} branch'
+          commit-message: 'AUTOMATED - git apply results'
+          title: Git apply result for ${{ env.BRANCH }} branch
          body: ${{ env.MESSAGE }}
          delete-branch: true
          branch-suffix: short-commit-hash
@@ -56,7 +56,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -193,6 +193,9 @@ jobs:
          $GH release upload $VERSION-$CROMITE_SHA arm64_symbols.zip
          echo "::endgroup::"

+          # workaround for https://github.com/cli/cli/issues/6599
+          sleep 30s
+
          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
@@ -13,8 +13,8 @@ permissions:

 on:
  push:
-    branches:
-      - 'master'
+    branches-ignore:
+      - 'ci'
    paths:
      - 'build/**'

@@ -67,7 +67,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
+        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -75,8 +75,8 @@ jobs:
          base: ${{ env.BRANCH }}
          add-paths: |
            build/patches/*.patch
-          commit-message: '[AUTO][DOC] Generate patches doc for master branch'
-          title: '[AUTO][DOC] Generate patches doc for master branch'
+          commit-message: 'AUTOMATED - update patch docs'
+          title: Generate patches doc for ${{ env.BRANCH }} branch
          body: ${{ env.MESSAGE }}
          delete-branch: true
          branch-suffix: short-commit-hash
@@ -91,31 +91,6 @@ you can activate the 'RendererAppContainer' flag from the command line with
  --enable-features=RendererAppContainer
 ```

-### Making Cromite work in Ubuntu 24.04 and its derivatives (kubuntu, etc)
-This happens because, starting with Ubuntu 24.04, Apparmor
-restricts the use of unprivileged user namespaces. To fix this, you have several options:
-#### 1. Creating an apparmor profile for cromite
-Create `/etc/apparmor.d/chrome`, and write:
-```
-abi <abi/4.0>,
-include <tunables/global>
-
-profile cromite /home/user/cromite/chrome-lin/chrome flags=(unconfined) {
-  userns,
-
-  include if exists <local/chrome>
-}
-```
-replacing the cromite binary path with where you have placed cromite.
-
-Now, run `sudo apparmor_parser -r /etc/apparmor.d/cromite` to apply the changes.
-#### 2. Disabling the restriction until next reboot
-`sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0`
-#### 3. Disabling the restriction permanently
-Add `kernel.apparmor_restrict_unprivileged_userns=0` to the file `/etc/sysctl.d/60-apparmor-namespace.conf`.  Create the file if not exists.
-### Auto-update setup for linux
-working in progress in https://github.com/uazo/cromite/issues/771
-
 # Contributing

 Please submit issues following the issue template; beware that GitHub does not display the templates from mobile.
@@ -137,8 +112,6 @@ For any usage or development discussion please use GitHub Discussions: https://g
  * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (via ungoogled-chromium)
  * [Brave Browser](https://github.com/brave/brave-core) for some patches

-thanks to [austinhuang0131](https://github.com/austinhuang0131) for the svg icon
-
 # License

 Cromite is published under [GNU GPL v3](./LICENSE).
@@ -1 +1 @@
-127.0.6533.73
+123.0.6312.105
@@ -111,8 +111,6 @@ if (target_os == "android") {
  system_webview_package_name="org.cromite.webview" #"com.android.webview"
  system_webview_shell_package_name="org.cromite.webview_shell"

-  chrome_pgo_phase = 2 # enable pgo
-
  if (getenv("USE_KEYSTORE") != "") {
    android_keystore_path = "/home/lg/working_dir/cromite.keystore"
    android_keystore_name = "cromite"
@@ -40,6 +40,7 @@ Disable-all-promo-dialogs.patch
 Disable-update-scheduler.patch
 Add-search-engine.patch
 openH264-enable-ARM-ARM64-optimizations.patch
+build-remove-calling-untrusted-hooks.patch
 Inject-scripts-for-AMP-tracking-ads-and-video.patch
 Allow-playing-audio-in-background.patch
 Add-flag-to-control-video-playback-resume-feature.patch
@@ -49,7 +50,6 @@ Multiple-fingerprinting-mitigations.patch
 Add-flag-to-configure-maximum-connections-per-host.patch
 Do-not-ignore-download-location-prompt-setting.patch
 Add-support-for-writing-URIs.patch
-Restore-BookmarkToolbar-setCurrentFolder.patch
 Add-bookmark-import-export-actions.patch
 Bookmarks-select-all-menu-entry.patch
 Add-an-always-incognito-mode.patch
@@ -57,7 +57,7 @@ Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
 Add-option-to-not-persist-tabs-across-sessions.patch
 Add-a-proxy-configuration-page.patch
 Add-custom-tab-intents-privacy-option.patch
-Disable-privacy-sandbox.patch
+Disable-FLoC-and-privacy-sandbox.patch
 History-number-of-days-privacy-setting.patch
 Disable-fetching-of-all-field-trials.patch
 Disable-plugins-enumeration.patch
@@ -70,6 +70,7 @@ autofill-miscellaneous.patch
 Enable-native-Android-autofill.patch
 translate-disable-fetching-of-languages-from-server.patch
 Offer-builtin-autocomplete-for-chrome-flags.patch
+Use-4-tile-rows-never-show-logo.patch
 Disable-various-metrics.patch
 Enable-StrictOriginIsolation-and-SitePerProcess.patch
 Use-64-bit-WebView-processes.patch
@@ -139,6 +140,7 @@ Re-introduce-override_build_timestamp.patch
 enable-ftrivial-auto-var-init-zero.patch
 disable-appending-variations-header.patch
 Disable-idle-detection.patch
+Allow-building-without-supervised-users.patch
 Disable-minidump-upload-scheduling.patch
 Revert-Permit-blocking-of-view-source.patch
 Disable-safety-check.patch
@@ -173,6 +175,7 @@ Override-Navigator-Language.patch
 Disable-add-to-home-screen-prompt.patch
 Remove-HTTP-referrals-in-cross-origin-navigation.patch
 Disable-StartSurface-feature.patch
+Enable-PermuteTLSExtensions-by-default.patch
 Enable-third-party-storage-partitioning.patch
 Restore-adaptive-button-in-top-toolbar-customization.patch
 Add-kill-switch-for-unsupported-clangd-flags.patch
@@ -217,6 +220,7 @@ Clear-CORS-Preflight-Cache-on-clearing-data.patch
 Multi-Screen-Window-Placement-API-fix.patch
 Add-a-flag-to-disable-GamePad-API.patch
 Disable-WebGPU.patch
+Disable-FirstPartySets-and-StorageAccessAPI.patch
 Disable-GetInstalledRelatedApps-API.patch
 Disable-GSA-by-default.patch
 Disable-PrivateStateTokens-API.patch
@@ -232,7 +236,6 @@ Add-webGL-site-setting.patch
 Add-webRTC-site-settings.patch
 Show-site-settings-for-cookies-javascript-and-ads.patch
 Viewport-Protection-flag.patch
-Revert-remove-allowscript-content-setting-secondary-url.patch
 Timezone-customization.patch
 Change-popup-site-setting.patch
 Disable-speechSynthesis-getVoices-API.patch
@@ -240,6 +243,7 @@ Remove-support-for-device-memory-and-cpu-recovery.patch
 Log-dangling-attributes-in-some-html-elements.patch
 Keep-Side-Panel-Companion-disabled.patch
 Lock-Profile-Cookie-Database.patch
+Show-warnings-on-downloads-over-HTTP.patch
 Compress-libchrome-to-free-up-some-space.patch
 Cromite-Branding.patch
 Disable-Feeback-Collector.patch
@@ -280,27 +284,13 @@ Enable-percent-based-scrolling-on-Windows.patch
 Show-NTP-at-startup.patch
 Enable-platform-aac-audio-and-h264-video.patch
 Disable-Paint-Preview-by-default.patch
-Do-not-use-Windows-ClearType-Text-Tuner-setting.patch
-Private-network-access-content-settings.patch
-Allow-building-without-supervised-users.patch
-Keep-ComputePressure-disabled.patch
-Android-Toolbar-Scroll-Ablation-setting.patch
-Keep-disabled-WebViewMediaIntegrityApi.patch
-Enable-menu-on-reload-button.patch
-Enable-Global-Privacy-Control.patch
-Enable-Do-Not-Track-by-default.patch
-Media-fingerprinting-mitigations.patch
-Use-BoringSSL-for-RandBytes.patch
-Restore-chrome-password-store.patch
-Close-Sessions-On-Ip-Change.patch
-Ask-for-restart-on-connection-change.patch
+Emoji-Fonts-fingerprinting-mitigation-02-02.patch
+Emoji-Fonts-fingerprinting-mitigation-01-02.patch

-Disable-wip-Android-Hub.patch
 Temp-PerformanceNavigationTiming-privacy-fix.patch
 Temp-disable-predictive-back-gesture.patch
 TEMP-Add-a-log-to-track-strange-behavior.patch
 Temp-guard-FileSystemAccessPersistentPermissions.patch
-Never-treat-Proguard-warnings-as-errors.patch
 Fix-chromium-build-bugs.patch

 eyeo-beta-118.0.5993.48-base.patch
@@ -308,4 +298,4 @@ eyeo-beta-118.0.5993.48-chrome_integration.patch
 eyeo-beta-118.0.5993.48-android_api.patch
 eyeo-beta-118.0.5993.48-android_settings.patch
 eyeo-beta-118.0.5993.48-extension_api.patch
-Eyeo-Adblock-for-Cromite.patch
+Eyeo-Adblock-Remove-Privacy-Issues.patch
@@ -90,8 +90,8 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3286,9 +3286,9 @@
-     "expiry_milestone": 135
+@@ -3046,9 +3046,9 @@
+     "expiry_milestone": 125
   },
   {
 -    "name": "enable-image-reader",
@@ -121,7 +121,7 @@ new file mode 100644
 diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
 --- a/gpu/config/gpu_driver_bug_list.json
 +++ b/gpu/config/gpu_driver_bug_list.json
-@@ -2696,6 +2696,22 @@
+@@ -2689,6 +2689,22 @@
         "no_downscaled_overlay_promotion"
       ]
     },
@@ -147,7 +147,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR,
+@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 #if BUILDFLAG(IS_ANDROID)
@@ -168,12 +168,12 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 #if BUILDFLAG(IS_ANDROID)
 +GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kEnableGpuMemoryBufferImplAHB);
 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReader);
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
 #if !BUILDFLAG(IS_ANDROID)
   return kGpuFeatureStatusDisabled;
 #else
@@ -183,7 +183,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
   if (!gpu_preferences.enable_android_surface_control)
     return kGpuFeatureStatusDisabled;
 
-@@ -387,6 +390,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -368,6 +371,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
         kGpuFeatureStatusBlocklisted;
   }
@@ -198,7 +198,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
 --- a/gpu/config/gpu_workaround_list.txt
 +++ b/gpu/config/gpu_workaround_list.txt
-@@ -10,6 +10,7 @@ clamp_texture_base_level_and_max_level
+@@ -11,6 +11,7 @@ clamp_texture_base_level_and_max_level
 clear_pixel_unpack_buffer_before_copyteximage
 disable_2d_canvas_auto_flush
 disable_accelerated_av1_decode
@@ -209,7 +209,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
 diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -69,6 +69,7 @@
+@@ -65,6 +65,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "ui/gfx/android/android_surface_control_compat.h"
@@ -217,7 +217,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 #endif
 
 #if BUILDFLAG(ENABLE_VULKAN)
-@@ -721,6 +722,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -662,6 +663,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
   }
 #endif  // BUILDFLAG(IS_WIN)
 
@@ -242,7 +242,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
 #include "base/android/scoped_hardware_buffer_fence_sync.h"
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
-@@ -49,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
+@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
 }
 
 TextureOwner::Mode GetTextureOwnerMode() {
@@ -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
-@@ -229,6 +229,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -230,6 +230,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
 import org.chromium.content_public.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ContentSwitches;
@@ -28,9 +28,9 @@ 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;
-@@ -1070,6 +1071,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1064,6 +1065,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         super.onStartWithNative();
-         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
+         ChromeActivitySessionTracker.getInstance().onStartWithNative();
         ChromeCachedFlags.getInstance().cacheNativeFlags();
 +        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
 +                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);
@@ -40,38 +40,38 @@ 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
-@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -136,6 +136,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &feed::kFeedShowSignInCommand,
     &feed::kFeedSignedOutViewDemotion,
     &feed::kFeedUserInteractionReliabilityReport,
 +    &kAllowUserCertificates,
     &feed::kInterestFeedV2,
     &feed::kInterestFeedV2Hearts,
-     &feed::kWebFeedAwareness,
+     &feed::kWebFeed,
 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
-@@ -153,6 +153,7 @@ public abstract class ChromeFeatureList {
-     /* Alphabetical: */
-     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
-             "AccountReauthenticationRecentTimeWindow";
+@@ -141,6 +141,7 @@ public abstract class ChromeFeatureList {
+         return ChromeFeatureMap.getInstance().mutableFlagWithSafeDefault(featureName, defaultValue);
+     }
+ 
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
             "AdaptiveButtonInTopToolbarTranslate";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
-@@ -555,6 +556,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAppInfoTabResumptionModule =
-             newCachedFlag(APP_INFO_TAB_RESUMPTION_MODULE, false);
-     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);
+@@ -533,6 +534,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidHub = newCachedFlag(ANDROID_HUB, false);
+     public static final CachedFlag sAndroidTabGroupStableIds =
+             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, false);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
-     public static final CachedFlag sAsyncNotificationManager =
-             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
-@@ -704,6 +707,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sBackGestureActivityTabProvider =
+             newCachedFlag(BACK_GESTURE_ACTIVITY_TAB_PROVIDER, false);
+@@ -679,6 +682,7 @@ public abstract class ChromeFeatureList {
+ 
     public static final List<CachedFlag> sFlagsCachedFullBrowser =
             List.of(
-                     sAccountReauthenticationRecentTimeWindow,
 +                    sAllowUserCertificates,
                     sAndroidAppIntegration,
                     sAndroidElegantTextHeight,
@@ -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
-@@ -360,6 +360,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -300,6 +300,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
       }
     }
 
@@ -6,26 +6,23 @@ adds a new flag in chrome://flags to re-enable the experiment

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- base/features.cc                                     |  4 ++++
+ base/features.cc                                     |  3 +++
 chrome/browser/about_flags.cc                        |  1 +
 .../Add-PartialLowEndModeOnMidRangeDevices-flag.inc  | 12 ++++++++++++
- 3 files changed, 17 insertions(+)
+ 3 files changed, 16 insertions(+)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc

 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -90,6 +90,10 @@ BASE_FEATURE(kCollectAndroidFrameTimelineMetrics,
-              FEATURE_DISABLED_BY_DEFAULT);
+@@ -67,4 +67,7 @@ BASE_FEATURE(kCollectAndroidFrameTimelineMetrics,
+              base::FEATURE_DISABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_ANDROID)
 
 +#if BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
 +#endif
-+
- void Init(EmitThreadControllerProfilerMetadata
-               emit_thread_controller_profiler_metadata) {
-   InitializeCpuReductionExperiment();
+ }  // namespace base::features
 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
@@ -14,8 +14,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7694,9 +7694,9 @@
-     "expiry_milestone": 130
+@@ -7195,9 +7195,9 @@
+     "expiry_milestone": 125
   },
   {
 -    "name": "restrict-gamepad-access",
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3109,7 +3109,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3089,7 +3089,7 @@ const char kResetShortcutCustomizationsDescription[] =
 
 const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
 const char kRestrictGamepadAccessDescription[] =
@@ -41,7 +41,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc
-@@ -64,4 +64,5 @@ bool IsGamepadMultitouchEnabled() {
+@@ -65,4 +65,5 @@ bool IsGamepadMultitouchEnabled() {
   return false;
 }
 
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
 chrome/browser/ui/BUILD.gn                    |   2 +
 .../webui/chrome_web_ui_controller_factory.cc |   3 +
- chrome/browser/ui/webui/proxy_config_ui.cc    | 392 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 393 ++++++++++++++++++
 chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++
 chrome/common/webui_url_constants.cc          |   4 +
 chrome/common/webui_url_constants.h           |   2 +
@@ -38,9 +38,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../proxy_config/proxy_config_dictionary.cc   |  30 +-
 .../proxy_config/proxy_config_dictionary.h    |   7 +-
 .../proxy_config/proxy_policy_handler.cc      |   2 +-
- net/proxy_resolution/proxy_config.cc          |  51 ++-
+ net/proxy_resolution/proxy_config.cc          |  52 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 979 insertions(+), 17 deletions(-)
+ 25 files changed, 981 insertions(+), 17 deletions(-)
 create mode 100644 chrome/browser/resources/proxy_config.css
 create mode 100644 chrome/browser/resources/proxy_config.html
 create mode 100644 chrome/browser/resources/proxy_config.js
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -19,6 +19,9 @@ found in the LICENSE file.
+@@ -25,6 +25,9 @@ found in the LICENSE file.
     <!-- Compositor Tab Title Text -->
     <bool name="compositor_tab_title_fake_bold_text">true</bool>
 
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -74,6 +74,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -76,6 +76,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private static final String PREF_SAFE_BROWSING = "safe_browsing";
     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -88,7 +88,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
-@@ -309,6 +309,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -308,6 +308,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   builtins_to_provide.push_back(
       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
 #endif
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -241,6 +241,9 @@
+@@ -237,6 +237,9 @@
         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />
       </if>
@@ -197,16 +197,16 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -195,6 +195,8 @@
+@@ -191,6 +191,8 @@
+ #include "printing/buildflags/buildflags.h"
 #include "rlz/buildflags/buildflags.h"
- #include "services/screen_ai/buildflags/buildflags.h"
 
 +#include "chrome/browser/net/proxy_service_factory.h"
 +
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
-@@ -1697,6 +1699,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1447,6 +1449,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -661,7 +661,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -327,6 +327,8 @@ static_library("ui") {
+@@ -301,6 +301,8 @@ static_library("ui") {
     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -673,7 +673,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_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -49,6 +49,7 @@
+@@ -52,6 +52,7 @@
 #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
 #include "chrome/browser/ui/webui/policy/policy_ui.h"
@@ -681,8 +681,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
 #include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
 #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
-@@ -450,6 +451,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -469,6 +470,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+     return &NewWebUI<MetricsInternalsUI>;
   if (url.host_piece() == chrome::kChromeUINetExportHost)
     return &NewWebUI<NetExportUI>;
 +  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
@@ -694,7 +694,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,392 @@
+@@ -0,0 +1,393 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -895,7 +895,8 @@ new file mode 100644
 +      state.SetByDottedPath("config.rules.fallback_proxies", base::Value(omitDirect(rules.fallback_proxies.ToPacString())));
 +      break;
 +    default:
-+     NOTREACHED_NORETURN();
+     NOTREACHED();
+     break;
 +  }
 +  state.SetByDottedPath("config.rules.type", base::Value(type));
 +  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));
@@ -1126,7 +1127,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
-@@ -50,6 +50,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+@@ -49,6 +49,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
 const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
 const char kChromeUIChromeSigninHost[] = "chrome-signin";
 const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
@@ -1135,7 +1136,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 const char kChromeUIChromeURLsHost[] = "chrome-urls";
 const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
 const char kChromeUIComponentsHost[] = "components";
-@@ -471,6 +473,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -460,6 +462,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
       kChromeUILockScreenNetworkHost,
       kChromeUILockScreenStartReauthHost,
       kChromeUIMobileSetupHost,
@@ -1143,7 +1144,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
       kChromeUIMultiDeviceSetupHost,
       kChromeUINetworkHost,
       kChromeUINotificationTesterHost,
-@@ -766,6 +769,7 @@ const char* const kChromeHostURLs[] = {
+@@ -760,6 +763,7 @@ const char* const kChromeHostURLs[] = {
 #if !BUILDFLAG(IS_ANDROID)
 #if !BUILDFLAG(IS_CHROMEOS)
     kChromeUIAppLauncherPageHost,
@@ -1154,7 +1155,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
-@@ -137,6 +137,8 @@ extern const char kChromeUINTPTilesInternalsHost[];
+@@ -134,6 +134,8 @@ extern const char kChromeUINTPTilesInternalsHost[];
 extern const char kChromeUINaClHost[];
 extern const char kChromeUINetExportHost[];
 extern const char kChromeUINetExportURL[];
@@ -1341,11 +1342,16 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
       }
 
       // Trim whitespace off the url scheme.
-@@ -140,6 +140,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -140,6 +140,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
   }
 }
 
 +std::string ProxyConfig::ProxyRules::ToString() const {
+  if (type == Type::EMPTY) {
+    return "";
+  }
+
+  // special case: a single proxy servers list specified
 +  if (type == Type::PROXY_LIST) {
 +    std::string proxy_list;
 +    for (const auto& proxy_chain : single_proxies.AllChains()) {
@@ -1357,41 +1363,37 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +      proxy_list.pop_back();
 +    }
 +    return proxy_list;
-+  } else if (type == Type::PROXY_LIST_PER_SCHEME) {
-+    // start to build a per-scheme list
-+    std::string list;
-+    for (const auto& proxy_chain : proxies_for_http.AllChains()) {
-+      if (proxy_chain.length()) {
-+        net::ProxyServer proxy_server = proxy_chain.First();
-+        list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
-+      }
-+    }
-+    for (const auto& proxy_chain : proxies_for_https.AllChains()) {
-+      if (proxy_chain.length()) {
-+        net::ProxyServer proxy_server = proxy_chain.First();
-+        list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
-+      }
-+    }
-+    for (const auto& proxy_chain : proxies_for_ftp.AllChains()) {
-+      if (proxy_chain.length()) {
-+        net::ProxyServer proxy_server = proxy_chain.First();
-+        list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
-+      }
-+    }
-+    for (const auto& proxy_chain : fallback_proxies.AllChains()) {
-+      if (proxy_chain.length()) {
-+        net::ProxyServer proxy_server = proxy_chain.First();
-+        list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
-+      }
-+    }
-+    if (list.length() != 0 ) {
-+      // remove last semicolon
-+      list.pop_back();
-+    }
-+    return list;
-+  } else {
+  }
+
+  if (type != Type::PROXY_LIST_PER_SCHEME) {
+    NOTREACHED();
+    // Unexpected LIST with fallback, or other type values
 +    return "";
 +  }
+
+  // start to build a per-scheme list
+  std::string list;
+  for (const auto& proxy_chain : proxies_for_http.AllChains()) {
+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+    list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
+  }
+  for (const auto& proxy_chain : proxies_for_https.AllChains()) {
+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+    list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
+  }
+  for (const auto& proxy_chain : proxies_for_ftp.AllChains()) {
+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+    list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
+  }
+  for (const auto& proxy_chain : fallback_proxies.AllChains()) {
+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+    list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
+  }
+  if (list.length() != 0 ) {
+    // remove last semicolon
+    list.pop_back();
+  }
+  return list;
 +}
 +
 const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
@@ -279,7 +279,7 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -248,7 +248,7 @@ void ContentSettingsRegistry::Init() {
+@@ -255,7 +255,7 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
@@ -299,7 +299,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 #include "third_party/blink/public/platform/web_media_player.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_local_frame_client.h"
-@@ -331,6 +332,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
+@@ -330,6 +331,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
 }
 
 bool AutoplayPolicy::IsGestureNeededForPlayback() const {
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
   if (!IsLockedPendingUserGesture())
     return false;
 
-@@ -429,6 +432,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -428,6 +431,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
   }
 }
 
@@ -329,7 +329,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/third_party/blink/renderer/core/html/media/autoplay_policy.h
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.h
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.h
-@@ -142,6 +142,10 @@ class CORE_EXPORT AutoplayPolicy final
+@@ -138,6 +138,10 @@ class CORE_EXPORT AutoplayPolicy final
   // should use, if checking to see if an action is allowed.
   bool IsLockedPendingUserGesture() const;
 
@@ -6,12 +6,12 @@ Add bookmark import/export actions in bookmarks activity and page
 Reduce permissions needed for bookmarks import/export
 Completely remove contacts picker permission from the file dialog

-Requires: Adds-support-for-writing-URIs.patch
-Requires: Restore-BookmarkToolbar-setCurrentFolder.patch
+Requires patch: Adds-support-for-writing-URIs.patch

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/android/java/AndroidManifest.xml       |   1 -
+ .../java/res/menu/bookmark_toolbar_menu.xml   |  14 +
 .../menu/bookmark_toolbar_menu_improved.xml   |  14 +
 .../browser/TabbedModeTabDelegateFactory.java |   5 +-
 .../app/bookmarks/BookmarkActivity.java       |  32 ++
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bookmarks/BookmarkManagerCoordinator.java |   9 +
 .../bookmarks/BookmarkManagerMediator.java    |  23 ++
 .../browser/bookmarks/BookmarkPage.java       |   8 +-
- .../browser/bookmarks/BookmarkToolbar.java    |  28 ++
+ .../browser/bookmarks/BookmarkToolbar.java    |  23 ++
 .../bookmarks/BookmarkToolbarMediator.java    |   4 +
 .../bookmarks/BookmarkToolbarProperties.java  |   8 +-
 .../bookmarks/BookmarkToolbarViewBinder.java  |   6 +
@@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 42 files changed, 919 insertions(+), 30 deletions(-)
+ 43 files changed, 928 insertions(+), 30 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -69,6 +69,30 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
 
+diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+--- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+@@ -23,6 +23,20 @@ found in the LICENSE file.
+             android:visible="false"
+             app:showAsAction="ifRoom"
+             app:iconTint="@color/default_icon_color_secondary_tint_list" />
+        <item
+            android:id="@+id/import_menu_id"
+            android:icon="@drawable/ic_folder_blue_24dp"
+            android:title="@string/import_bookmarks"
+            android:visible="true"
+            app:showAsAction="ifRoom"
+            app:iconTint="@color/default_icon_color_tint_list" />
+        <item
+            android:id="@+id/export_menu_id"
+            android:icon="@drawable/ic_file_download_white_24dp"
+            android:title="@string/export_bookmarks"
+            android:visible="true"
+            app:showAsAction="ifRoom"
+            app:iconTint="@color/default_icon_color_tint_list" />
+         <item
+             android:id="@+id/close_menu_id"
+             android:icon="@drawable/btn_close"
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
@@ -104,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
 import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-@@ -54,7 +55,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
+@@ -53,7 +54,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
  * {@link ChromeTabbedActivity}.
  */
 public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -113,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
     private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
     private final Supplier<ShareDelegate> mShareDelegateSupplier;
     private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
-@@ -83,7 +84,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+@@ -82,7 +83,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
     private NativePageFactory mNativePageFactory;
 
     public TabbedModeTabDelegateFactory(
@@ -246,7 +270,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 /**
  * Provides the communication channel for Android to fetch and manipulate the bookmark model stored
  * in native.
-@@ -474,6 +516,212 @@ class BookmarkBridge {
+@@ -483,6 +525,212 @@ class BookmarkBridge {
                 .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType());
     }
 
@@ -459,8 +483,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /**
      * Synchronously gets a list of bookmarks that match the specified search query.
      *
-@@ -1032,6 +1280,39 @@ class BookmarkBridge {
-         BookmarkUtils.clearLastUsedPrefs();
+@@ -1036,6 +1284,39 @@ class BookmarkBridge {
+         depthList.add(depth);
     }
 
 +    @CalledByNative
@@ -533,7 +557,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -49,6 +49,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
+@@ -48,6 +48,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
 import org.chromium.components.image_fetcher.ImageFetcherConfig;
 import org.chromium.components.image_fetcher.ImageFetcherFactory;
 import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -542,7 +566,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-@@ -303,6 +305,13 @@ public class BookmarkManagerCoordinator
+@@ -326,6 +328,13 @@ public class BookmarkManagerCoordinator
 
     // Public API implementation.
 
@@ -559,16 +583,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -52,6 +52,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+@@ -53,6 +53,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
 import org.chromium.components.commerce.core.CommerceSubscription;
 import org.chromium.components.commerce.core.ShoppingService;
- import org.chromium.components.commerce.core.SubscriptionsObserver;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.components.favicon.LargeIconBridge;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
-@@ -81,6 +83,9 @@ class BookmarkManagerMediator
+@@ -82,6 +84,9 @@ class BookmarkManagerMediator
 
     private static boolean sPreventLoadingForTesting;
 
@@ -578,7 +602,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /** Keeps track of whether drag is enabled / active for bookmark lists. */
     private class BookmarkDragStateDelegate implements DragStateDelegate {
         private BookmarkDelegate mBookmarkDelegate;
-@@ -568,6 +573,14 @@ class BookmarkManagerMediator
+@@ -554,6 +559,14 @@ class BookmarkManagerMediator
         mNativePage = nativePage;
     }
 
@@ -593,7 +617,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /** See BookmarkManager(Coordinator)#updateForUrl */
     void updateForUrl(String url) {
         // Bookmark model is null if the manager has been destroyed.
-@@ -748,6 +761,16 @@ class BookmarkManagerMediator
+@@ -734,6 +747,16 @@ class BookmarkManagerMediator
         }
     }
 
@@ -645,7 +669,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -101,6 +101,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -120,6 +120,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
         setOnMenuItemClickListener(dragEnabled ? null : this);
     }
 
@@ -660,24 +684,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mExportBookmarkRunnable = runnable;
 +    }
 +
-     void setEditButtonVisible(boolean visible) {
-         mEditButtonVisible = visible;
-         getMenu().findItem(R.id.edit_menu_id).setVisible(visible);
-@@ -177,6 +188,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+     void setSearchButtonVisible(boolean visible) {
+         // The improved bookmarks experience embeds search in the list.
+         if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) return;
+@@ -173,6 +184,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
 
     void setCurrentFolder(BookmarkId folder) {
         mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
-+        enableImportExportMenu();
-+    }
-+
-+    void enableImportExportMenu() {
 +        getMenu().findItem(R.id.import_menu_id).setVisible(true);
 +        getMenu().findItem(R.id.export_menu_id).setVisible(true);
-+    }
     }
 
     void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -196,6 +214,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -192,6 +205,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
     @Override
     public boolean onMenuItemClick(MenuItem menuItem) {
         hideOverflowMenu();
@@ -691,7 +710,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         return mMenuIdClickedFunction.apply(menuItem.getItemId());
     }
 
-@@ -211,6 +236,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -212,6 +232,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
     protected void showNormalView() {
         super.showNormalView();
 
@@ -699,8 +718,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
 +
         // SelectableListToolbar will show/hide the entire group.
+         setSearchButtonVisible(mSearchButtonVisible);
         setEditButtonVisible(mEditButtonVisible);
-         setNewFolderButtonVisible(mNewFolderButtonVisible);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
@@ -718,7 +737,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
-@@ -81,6 +81,10 @@ class BookmarkToolbarProperties {
+@@ -69,6 +69,10 @@ class BookmarkToolbarProperties {
 
     static final WritableObjectPropertyKey<Runnable> NAVIGATE_BACK_RUNNABLE =
             new WritableObjectPropertyKey<>();
@@ -728,13 +747,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +            new WritableObjectPropertyKey<>();
 
     static final PropertyKey[] ALL_KEYS = {
-         BOOKMARK_OPENER,
-@@ -108,6 +112,8 @@ class BookmarkToolbarProperties {
-         SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO,
-         SELECTION_MODE_SHOW_MOVE,
-         SELECTION_MODE_SHOW_MARK_READ,
-        SELECTION_MODE_SHOW_MARK_UNREAD
-+        SELECTION_MODE_SHOW_MARK_UNREAD,
+         BOOKMARK_MODEL,
+@@ -91,6 +95,8 @@ class BookmarkToolbarProperties {
+         CHECKED_VIEW_MENU_ID,
+         MENU_ID_CLICKED_FUNCTION,
+         NAVIGATE_BACK_RUNNABLE,
+-        FAKE_SELECTION_STATE_CHANGE
+        FAKE_SELECTION_STATE_CHANGE,
 +        IMPORT_BOOKMARK_RUNNABLE,
 +        EXPORT_BOOKMARK_RUNNABLE
     };
@@ -742,7 +761,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
-@@ -56,6 +56,12 @@ class BookmarkToolbarViewBinder {
+@@ -59,6 +59,12 @@ class BookmarkToolbarViewBinder {
                     model.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID));
         } else if (key == BookmarkToolbarProperties.CURRENT_FOLDER) {
             bookmarkToolbar.setCurrentFolder(model.get(BookmarkToolbarProperties.CURRENT_FOLDER));
@@ -758,15 +777,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -18,6 +18,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+@@ -17,6 +17,7 @@ import org.chromium.base.supplier.DestroyableObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
- import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.app.download.home.DownloadPage;
 import org.chromium.chrome.browser.bookmarks.BookmarkPage;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier;
-@@ -57,7 +58,7 @@ import org.chromium.ui.util.ColorUtils;
+@@ -54,7 +55,7 @@ import org.chromium.ui.util.ColorUtils;
  * Creates NativePage objects to show chrome-native:// URLs using the native Android view system.
  */
 public class NativePageFactory {
@@ -775,8 +794,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
     private final BottomSheetController mBottomSheetController;
     private final BrowserControlsManager mBrowserControlsManager;
     private final Supplier<Tab> mCurrentTabSupplier;
-@@ -78,7 +79,7 @@ public class NativePageFactory {
-     private static NativePage sTestPage;
+@@ -74,7 +75,7 @@ public class NativePageFactory {
+     private NativePageBuilder mNativePageBuilder;
 
     public NativePageFactory(
 -            @NonNull Activity activity,
@@ -784,7 +803,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
             @NonNull BottomSheetController sheetController,
             @NonNull BrowserControlsManager browserControlsManager,
             @NonNull Supplier<Tab> currentTabSupplier,
-@@ -144,7 +145,7 @@ public class NativePageFactory {
+@@ -140,7 +141,7 @@ public class NativePageFactory {
 
     @VisibleForTesting
     static class NativePageBuilder {
@@ -793,7 +812,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
         private final BottomSheetController mBottomSheetController;
         private final Supplier<NewTabPageUma> mUma;
         private final BrowserControlsManager mBrowserControlsManager;
-@@ -162,7 +163,7 @@ public class NativePageFactory {
+@@ -158,7 +159,7 @@ public class NativePageFactory {
         private final OneshotSupplier<ModuleRegistry> mModuleRegistrySupplier;
 
         public NativePageBuilder(
@@ -802,7 +821,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
                 Supplier<NewTabPageUma> uma,
                 BottomSheetController sheetController,
                 BrowserControlsManager browserControlsManager,
-@@ -233,7 +234,7 @@ public class NativePageFactory {
+@@ -228,7 +229,7 @@ public class NativePageFactory {
                     mActivity.getComponentName(),
                     mSnackbarManagerSupplier.get(),
                     tab.getProfile(),
@@ -814,7 +833,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -203,6 +203,8 @@ static_library("browser") {
+@@ -201,6 +201,8 @@ static_library("browser") {
     "bluetooth/chrome_bluetooth_delegate_impl_client.h",
     "bookmarks/bookmark_model_factory.cc",
     "bookmarks/bookmark_model_factory.h",
@@ -837,7 +856,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     "//build/config:precompiled_headers",
-@@ -3746,8 +3755,6 @@ static_library("browser") {
+@@ -3649,8 +3658,6 @@ static_library("browser") {
       "badging/badge_manager_factory.h",
       "banners/app_banner_manager_desktop.cc",
       "banners/app_banner_manager_desktop.h",
@@ -850,8 +869,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -59,6 +59,28 @@
+ #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
- #include "url/gurl.h"
 
 +#include "base/android/content_uri_utils.h"
 +#include "base/android/path_utils.h"
@@ -875,10 +894,10 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +#include "ui/shell_dialogs/selected_file_info.h"
 +#include "ui/shell_dialogs/select_file_dialog.h"
 +
- // Must come after all headers that specialize FromJniType() / ToJniType().
- #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h"
- 
-@@ -77,12 +99,96 @@ using bookmarks::android::JavaBookmarkIdGetType;
+ using base::android::AttachCurrentThread;
+ using base::android::ConvertUTF16ToJavaString;
+ using base::android::ConvertUTF8ToJavaString;
+@@ -76,12 +98,96 @@ using bookmarks::android::JavaBookmarkIdGetType;
 using content::BrowserThread;
 using power_bookmarks::PowerBookmarkMeta;
 
@@ -975,7 +994,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 class BookmarkTitleComparer {
  public:
   explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -223,6 +329,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -232,6 +338,10 @@ BookmarkBridge::~BookmarkBridge() {
   partner_bookmarks_shim_observation_.Reset();
   bookmark_model_observation_.Reset();
   profile_observation_.Reset();
@@ -985,8 +1004,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    select_file_dialog_->ListenerDestroyed();
 }
 
- void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -762,6 +872,183 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+ void BookmarkBridge::Destroy(JNIEnv*) {
+@@ -668,6 +778,183 @@ jint BookmarkBridge::GetTotalBookmarkCount(
   return count;
 }
 
@@ -1173,16 +1192,16 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 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
-@@ -20,6 +20,7 @@
- #include "base/strings/utf_string_conversions.h"
+@@ -21,6 +21,7 @@
 #include "base/supports_user_data.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
+ #include "chrome/browser/image_service/image_service_factory.h"
 +#include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_observer.h"
 #include "chrome/browser/reading_list/android/reading_list_manager.h"
-@@ -37,6 +38,9 @@
- #include "components/signin/public/identity_manager/identity_manager.h"
+@@ -33,6 +34,9 @@
+ #include "components/prefs/pref_change_registrar.h"
 #include "url/android/gurl_android.h"
 
 +#include "components/search_engines/template_url.h"
@@ -1191,16 +1210,16 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 class BookmarkBridgeTest;
 
 // The delegate to fetch bookmarks information for the Android native
-@@ -50,7 +54,8 @@ class BookmarkBridge : public ProfileObserver,
+@@ -44,7 +48,8 @@ class BookmarkBridge : public ProfileObserver,
+                        public bookmarks::BaseBookmarkModelObserver,
+                        public PartnerBookmarksShim::Observer,
                        public ReadingListManager::Observer,
-                        public ReadingListModelObserver,
-                        public signin::IdentityManager::Observer,
 -                       public base::SupportsUserData::Data {
 +                       public base::SupportsUserData::Data,
 +                       public ui::SelectFileDialog::Listener {
  public:
-   // All of the injected pointers must be non-null and must outlive `this`.
-   BookmarkBridge(Profile* profile,
+   BookmarkBridge(
+       Profile* profile,
@@ -81,6 +86,12 @@ class BookmarkBridge : public ProfileObserver,
 
   bool IsDoingExtensiveChanges(JNIEnv* env);
@@ -1230,17 +1249,16 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   void GetAllFoldersWithDepths(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& j_folders_obj,
-@@ -363,6 +383,9 @@ class BookmarkBridge : public ProfileObserver,
-   void CreateOrDestroyAccountReadingListManagerIfNeeded();
+@@ -356,12 +376,16 @@ class BookmarkBridge : public ProfileObserver,
+   void DestroyJavaObject();
 
-   const raw_ptr<Profile> profile_;  // weak
+   raw_ptr<Profile> profile_;  // weak
 +  base::FilePath export_path_;
 +  raw_ptr<BookmarksExportObserver> observer_; // weak
 +
   base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
-   const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
-   const raw_ptr<bookmarks::ManagedBookmarkService>
-@@ -377,6 +400,7 @@ class BookmarkBridge : public ProfileObserver,
+   raw_ptr<bookmarks::BookmarkModel> bookmark_model_;                     // weak
+   raw_ptr<bookmarks::ManagedBookmarkService> managed_bookmark_service_;  // weak
   std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
       grouped_bookmark_actions_;
   PrefChangeRegistrar pref_change_registrar_;
@@ -1248,7 +1266,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
-@@ -408,6 +432,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -389,6 +413,10 @@ class BookmarkBridge : public ProfileObserver,
 
   bool suppress_observer_notifications_ = false;
 
@@ -1330,7 +1348,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
 --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
 +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
-@@ -38,18 +38,18 @@ import java.util.ArrayList;
+@@ -37,18 +37,18 @@ import java.util.ArrayList;
  */
 public class DownloadLocationDialogCoordinator implements ModalDialogProperties.Controller {
     @NonNull private DownloadLocationDialogController mController;
@@ -1353,7 +1371,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
     private boolean mLocationDialogManaged;
 
     /**
-@@ -141,7 +141,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
+@@ -140,7 +140,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
      * Called after retrieved the download directory options.
      * @param dirs An list of available download directories.
      */
@@ -1365,21 +1383,21 @@ 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
-@@ -188,6 +188,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -176,6 +176,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kCacheActivityTaskID,
     &kCastDeviceFilter,
-     &kCCTAuthView,
+     &kClearOmniboxFocusAfterNavigation,
 +    &kBookmarksExportUseSaf,
-     &kCCTBeforeUnload,
+     &kCreateNewTabInitializeRenderer,
+     &kCCTBrandTransparencyMemoryImprovement,
     &kCCTClientDataHeader,
-     &kCCTExtendTrustedCdnPublisher,
 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
-@@ -517,6 +517,7 @@ public abstract class ChromeFeatureList {
+@@ -502,6 +502,7 @@ public abstract class ChromeFeatureList {
+     public static final String USER_BYPASS_UI = "UserBypassUI";
     public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =
             "VerticalAutomotiveBackButtonToolbar";
-     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
     public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
     public static final String WEB_APK_ALLOW_ICON_UPDATE = "WebApkAllowIconUpdate";
@@ -1437,9 +1455,9 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 +    public static final String BOOKMARKS_LAST_EXPORT_URI =
 +            "Chrome.Bookmarks.Last_Export_Uri";
 
-     /** Whether Chrome is set as the default browser. Default value is false. */
-     public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
-@@ -921,6 +923,7 @@ public final class ChromePreferenceKeys {
+     /**
+      * Whether Chrome is set as the default browser.
+@@ -894,6 +896,7 @@ public final class ChromePreferenceKeys {
                 AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
                 APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                 APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1450,7 +1468,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
-@@ -245,6 +245,24 @@ CHAR_LIMIT guidelines:
+@@ -248,6 +248,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>
@@ -1478,7 +1496,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -395,6 +395,9 @@ static_library("common_lib") {
+@@ -404,6 +404,9 @@ static_library("common_lib") {
     sources += [
       "media/chrome_media_drm_bridge_client.cc",
       "media/chrome_media_drm_bridge_client.h",
@@ -1491,7 +1509,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -89,8 +89,6 @@ static_library("utility") {
+@@ -84,8 +84,6 @@ static_library("utility") {
 
   if (!is_android) {
     sources += [
@@ -1500,7 +1518,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
       "importer/bookmarks_file_importer.cc",
       "importer/bookmarks_file_importer.h",
       "importer/external_process_importer_bridge.cc",
-@@ -228,6 +226,11 @@ static_library("utility") {
+@@ -220,6 +218,11 @@ static_library("utility") {
     ]
   }
 
@@ -1752,7 +1770,7 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st
 diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
 --- a/ui/shell_dialogs/select_file_dialog.h
 +++ b/ui/shell_dialogs/select_file_dialog.h
-@@ -209,6 +209,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
+@@ -199,6 +199,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
                   const GURL* caller = nullptr);
   bool HasMultipleFileTypeChoices();
 
@@ -1764,7 +1782,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil
 diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
 --- a/ui/shell_dialogs/select_file_dialog_android.cc
 +++ b/ui/shell_dialogs/select_file_dialog_android.cc
-@@ -139,6 +139,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+@@ -137,6 +137,12 @@ void SelectFileDialogImpl::SelectFileImpl(
                                    owning_window->GetJavaObject());
 }
 
@@ -1818,7 +1836,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_linux.h b/ui/shell_dialogs/sele
 diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
 --- a/ui/shell_dialogs/select_file_dialog_win.cc
 +++ b/ui/shell_dialogs/select_file_dialog_win.cc
-@@ -195,6 +195,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
+@@ -194,6 +194,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
                             int index);
 
   bool HasMultipleFileTypeChoicesImpl() override;
@@ -1826,7 +1844,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec
 
   // Returns the filter to be used while displaying the open/save file dialog.
   // This is computed from the extensions for the file types being opened.
-@@ -273,6 +274,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
+@@ -272,6 +273,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
   return has_multiple_file_type_choices_;
 }
 
@@ -15,14 +15,13 @@ Need: bromite-build-utils.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 base/BUILD.gn                                 |   4 +-
- base/android/feature_map.cc                   |   5 +
+ base/android/feature_map.cc                   |   8 +-
 .../base/cached_flags/CachedFlag.java         |   8 +-
- base/feature_list.cc                          |  76 +++++++++
+ base/feature_list.cc                          |  78 +++++++++
 base/feature_list.h                           |  72 ++++++++-
 build/android/gyp/java_cpp_features.py        |  17 ++
 chrome/android/java/res/values/values.xml     |   3 +
 .../java/res/xml/privacy_preferences.xml      |   4 +
- .../settings/AccessibilitySettings.java       |   5 +-
 .../homepage/settings/HomepageSettings.java   |   2 +-
 .../privacy/settings/PrivacySettings.java     |   2 +-
 .../browser/settings/SettingsActivity.java    |  36 +++++
@@ -40,13 +39,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../placeholder.txt                           |   1 +
 chrome/browser/ui/ui_features.cc              |   1 +
 chrome/common/chrome_features.cc              |   1 +
- .../res/xml/accessibility_preferences.xml     |   3 +-
 .../android/java/res/values/attrs.xml         |   4 +
 .../settings/ChromeSwitchPreference.java      |  20 +++
 components/components_strings.grd             |   1 +
 .../content_settings/core/common/features.cc  |   1 +
 .../placeholder.txt                           |   1 +
- components/flags_ui/flags_state.cc            |  55 ++++++-
+ components/flags_ui/flags_state.cc            |  56 ++++++-
 components/flags_ui/resources/app.html        |  42 ++++-
 components/flags_ui/resources/app.ts          |  41 ++++-
 components/flags_ui/resources/experiment.html |   7 +-
@@ -90,7 +88,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 services/network/public/cpp/features.h        |   1 +
 third_party/blink/common/features.cc          |   1 +
 third_party/blink/public/common/features.h    |   1 +
- 76 files changed, 738 insertions(+), 22 deletions(-)
+ 74 files changed, 738 insertions(+), 20 deletions(-)
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/placeholder.txt
@@ -122,7 +120,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -202,6 +202,8 @@ buildflag_header("message_pump_buildflags") {
+@@ -212,6 +212,8 @@ buildflag_header("message_pump_buildflags") {
 # This does not include test code (test support and anything in the test
 # directory) which should use source_set as is recommended for GN targets).
 component("base") {
@@ -131,7 +129,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
   sources = [
     "allocator/allocator_check.cc",
     "allocator/allocator_check.h",
-@@ -1054,7 +1056,7 @@ component("base") {
+@@ -1055,7 +1057,7 @@ component("base") {
     "//build/config/compiler:wglobal_constructors",
   ]
 
@@ -143,23 +141,28 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
 diff --git a/base/android/feature_map.cc b/base/android/feature_map.cc
 --- a/base/android/feature_map.cc
 +++ b/base/android/feature_map.cc
-@@ -45,6 +45,11 @@ const Feature* FeatureMap::FindFeatureExposedToJava(
- static jboolean JNI_FeatureMap_IsEnabled(JNIEnv* env,
-                                          jlong jfeature_map,
-                                          std::string& feature_name) {
+@@ -45,9 +45,15 @@ static jboolean JNI_FeatureMap_IsEnabled(
+     JNIEnv* env,
+     jlong jfeature_map,
+     const android::JavaParamRef<jstring>& jfeature_name) {
+  std::string feature_name = ConvertJavaStringToUTF8(env, jfeature_name);
 +  if (base::FeatureList::IsCromiteFlag(feature_name)) {
 +    const base::Feature* cromite_feature =
 +      base::FeatureList::GetCromiteFlag(feature_name);
 +    return base::FeatureList::IsEnabled(*cromite_feature);
 +  }
   FeatureMap* feature_map = reinterpret_cast<FeatureMap*>(jfeature_map);
-   const base::Feature* feature =
-       feature_map->FindFeatureExposedToJava(feature_name);
+   const base::Feature* feature = feature_map->FindFeatureExposedToJava(
+-      StringPiece(ConvertJavaStringToUTF8(env, jfeature_name)));
+      StringPiece(feature_name));
+   return base::FeatureList::IsEnabled(*feature);
+ }
+ 
 diff --git a/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.java b/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.java
 --- a/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.java
 +++ b/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.java
-@@ -142,7 +142,7 @@ public class CachedFlag extends Flag {
-         editor.putBoolean(getSharedPreferenceKey(), isEnabledInNative);
+@@ -125,7 +125,7 @@ public class CachedFlag extends Flag {
+                 .writeBoolean(getSharedPreferenceKey(), isEnabledInNative);
     }
 
 -    String getSharedPreferenceKey() {
@@ -167,8 +170,8 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.jav
         // Create the key only once to avoid String concatenation every flag check.
         if (mPreferenceKey == null) {
             mPreferenceKey = CachedFlagsSharedPreferences.FLAGS_CACHED.createKey(mFeatureName);
-@@ -169,6 +169,12 @@ public class CachedFlag extends Flag {
-         }
+@@ -157,6 +157,12 @@ public class CachedFlag extends Flag {
+                 .removeKeysWithPrefix(CachedFlagsSharedPreferences.FLAGS_CACHED);
     }
 
 +    public void setValueReturnedOverride(@Nullable Boolean value) {
@@ -183,7 +186,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/CachedFlag.jav
 diff --git a/base/feature_list.cc b/base/feature_list.cc
 --- a/base/feature_list.cc
 +++ b/base/feature_list.cc
-@@ -43,6 +43,31 @@
+@@ -37,6 +37,31 @@
 
 namespace base {
 
@@ -215,7 +218,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 namespace {
 
 // Pointer to the FeatureList instance singleton that was set via
-@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -464,6 +489,48 @@ bool FeatureList::IsEnabled(const Feature& feature) {
   return g_feature_list_instance->IsFeatureEnabled(feature);
 }
 
@@ -236,7 +239,8 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 +      return key;
 +    }
 +  }
-+  NOTREACHED_NORETURN();
+  NOTREACHED();
+  return nullptr;
 +}
 +
 +// static
@@ -256,13 +260,14 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 +      return value == base::FEATURE_ENABLED_BY_DEFAULT;
 +    }
 +  }
-+  NOTREACHED_NORETURN();
+  NOTREACHED();
+  return false;
 +}
 +
 // static
- bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
+ bool FeatureList::IsValidFeatureOrFieldTrialName(StringPiece name) {
   return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
-@@ -718,6 +783,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor) {
+@@ -710,6 +777,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor) {
 
 void FeatureList::FinalizeInitialization() {
   DCHECK(!initialized_);
@@ -283,20 +288,20 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 diff --git a/base/feature_list.h b/base/feature_list.h
 --- a/base/feature_list.h
 +++ b/base/feature_list.h
-@@ -108,8 +108,10 @@ enum class FeatureMacroHandshake { kSecret };
+@@ -99,8 +99,10 @@ enum FeatureState {
+ // [1]:
+ // https://crsrc.org/c/docs/speed/binary_size/android_binary_size_trybot.md#Mutable-Constants
 struct BASE_EXPORT LOGICALLY_CONST Feature {
-   constexpr Feature(const char* name,
-                     FeatureState default_state,
-                    internal::FeatureMacroHandshake)
+-  constexpr Feature(const char* name, FeatureState default_state)
 -      : name(name), default_state(default_state) {
-+                    internal::FeatureMacroHandshake,
-+                    bool cromite = false, bool is_new_flag = false)
+  constexpr Feature(const char* name, FeatureState default_state,
+                      bool cromite = false, bool is_new_flag = false)
 +      : name(name), default_state(default_state),
 +        is_cromite(cromite), is_new(is_new_flag) {
 #if BUILDFLAG(ENABLE_BANNED_BASE_FEATURE_PREFIX)
-     if (std::string_view(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) ==
-         0) {
-@@ -136,6 +138,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
+     if (StringPiece(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) == 0) {
+       LOG(FATAL) << "Invalid feature name " << name << " starts with "
+@@ -126,6 +128,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
   // command line switch.
   const FeatureState default_state;
 
@@ -306,7 +311,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
  private:
   friend class FeatureList;
 
-@@ -411,6 +416,11 @@ class BASE_EXPORT FeatureList {
+@@ -401,6 +406,11 @@ class BASE_EXPORT FeatureList {
   // instance, which is checked in builds with DCHECKs enabled.
   static bool IsEnabled(const Feature& feature);
 
@@ -318,7 +323,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
   // Some characters are not allowed to appear in feature names or the
   // associated field trial names, as they are used as special characters for
   // command-line serialization. This function checks that the strings are ASCII
-@@ -676,4 +686,62 @@ class BASE_EXPORT FeatureList {
+@@ -665,4 +675,62 @@ class BASE_EXPORT FeatureList {
 
 }  // namespace base
 
@@ -340,7 +345,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
 +}  // namespace base
 +
 +#define CROMITE_FEATURE(feature, name, default_state) \
-+  constinit const base::Feature feature(name, default_state, base::internal::FeatureMacroHandshake::kSecret, true, true); \
+  constinit const base::Feature feature(name, default_state, true, true); \
 +  _Pragma("clang diagnostic push")                              \
 +  _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") \
 +  static const ::base::internal::FeatureDefaultStateOverrider   \
@@ -428,7 +433,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -75,6 +75,10 @@ found in the LICENSE file.
+@@ -59,6 +59,10 @@ found in the LICENSE file.
         android:title="@string/tabgrid_use_icons_title"
         android:summary="@string/tabgrid_use_icons_summary"
         android:defaultValue="false" />
@@ -439,35 +444,6 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
     <Preference
         android:key="preload_pages"
         android:title="@string/preload_pages_title"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -16,6 +16,7 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsController;
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
- import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
- import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
-@@ -34,7 +35,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
- import org.chromium.content_public.browser.ContentFeatureMap;
- 
- /** Fragment to keep track of all the accessibility related preferences. */
-public class AccessibilitySettings extends PreferenceFragmentCompat
-+public class AccessibilitySettings extends ChromeBaseSettingsFragment
-         implements Preference.OnPreferenceChangeListener {
-     public static final String PREF_TEXT_SCALE = "text_scale";
-     public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
-@@ -108,7 +109,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     }
- 
-     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+    public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
-         SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
- 
-         mTextScalePref = (TextScalePreference) findPreference(PREF_TEXT_SCALE);
 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
@@ -483,7 +459,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -121,7 +121,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private static final String PREF_HISTORY_EXPIRE_DAYS_THRESHOLD = "history_expire_days_threshold";
 
     @Override
@@ -503,15 +479,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-@@ -85,6 +86,7 @@ import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
+@@ -74,6 +75,7 @@ import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
 import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+ import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
- import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
-@@ -126,6 +128,36 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -114,6 +116,36 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
         implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
                 SnackbarManageable,
                 DisplayStyleObserver {
@@ -548,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public static final String EXTRA_SHOW_FRAGMENT = "show_fragment";
 
-@@ -379,6 +411,10 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -367,6 +399,10 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                 ((AccessibilitySettings) fragment)
                     .getDelegate()).setSnackbarManager(mSnackbarManager);
         }
@@ -556,13 +532,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 +            ((ChromeBaseSettingsFragment)fragment).setRequestRestartDelegate(
 +                new RequestRestartDelegate(mSnackbarManager, this));
 +        }
-         if (fragment instanceof AccountManagementFragment) {
-             ((AccountManagementFragment) fragment).setSnackbarManager(mSnackbarManager);
-         }
+         initBackPressHandler();
+     }
+ 
 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
-@@ -376,6 +376,10 @@ using flags_ui::kOsLinux;
+@@ -371,6 +371,10 @@ using flags_ui::kOsLinux;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
 
@@ -573,9 +549,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 namespace about_flags {
 
 namespace {
-@@ -4076,6 +4080,10 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
-      kAutofillUpstreamUpdatedUi_Education_Animated,
-      std::size(kAutofillUpstreamUpdatedUi_Education_Animated), nullptr}};
+@@ -3710,6 +3714,10 @@ const FeatureEntry::Choice kAccountBookmarksAndReadingListBehindOptInChoices[] =
+ };
+ #endif  // BUILDFLAG(IS_ANDROID)
 
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -584,7 +560,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the entry is the internal name.
-@@ -4102,6 +4110,9 @@ const FeatureEntry::FeatureVariation kAutofillUpstreamUpdatedUiOptions[] = {
+@@ -3736,6 +3744,9 @@ const FeatureEntry::Choice kAccountBookmarksAndReadingListBehindOptInChoices[] =
 const FeatureEntry kFeatureEntries[] = {
 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 // //tools/flags/generate_unexpire_flags.py.
@@ -597,9 +573,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc
 --- a/chrome/browser/browser_features.cc
 +++ b/chrome/browser/browser_features.cc
-@@ -401,4 +401,5 @@ BASE_FEATURE(kBrowserDynamicCodeDisabled,
+@@ -368,4 +368,5 @@ BASE_FEATURE(kNetworkAnnotationMonitoring,
+              "NetworkAnnotationMonitoring",
              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_WIN)
 
 +#include "cromite_flags/chrome_browser_browser_features_cc.inc"
 }  // namespace features
@@ -645,8 +621,8 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1036,5 +1036,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,
-              "WebApkAllowIconUpdate",
+@@ -978,5 +978,6 @@ BASE_FEATURE(kWebApkIconUpdateThreshold,
+              "WebApkIconUpdateThreshold",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
@@ -655,7 +631,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -193,6 +193,7 @@ constexpr base::FeatureParam<int> kAuxiliarySearchMaxTabsCountParam(
+@@ -188,6 +188,7 @@ constexpr base::FeatureParam<int> kAuxiliarySearchMaxTabsCountParam(
     "auxiliary_search_max_donation_tab",
     100);
 
@@ -666,7 +642,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -15,6 +15,10 @@ import org.chromium.base.cached_flags.DoubleCachedFieldTrialParameter;
+@@ -13,6 +13,10 @@ import org.chromium.base.cached_flags.DoubleCachedFieldTrialParameter;
 import org.chromium.base.cached_flags.IntCachedFieldTrialParameter;
 import org.chromium.base.cached_flags.StringCachedFieldTrialParameter;
 
@@ -677,16 +653,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 import java.util.List;
 import java.util.Map;
 
-@@ -719,7 +723,7 @@ public abstract class ChromeFeatureList {
+@@ -691,7 +695,7 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sVerticalAutomotiveBackButtonToolbar =
             newCachedFlag(VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR, true);
 
 -    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +    public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
             List.of(
-                     sAccountReauthenticationRecentTimeWindow,
                     sAllowUserCertificates,
-@@ -816,6 +820,13 @@ public abstract class ChromeFeatureList {
+                     sAndroidAppIntegration,
+@@ -779,6 +783,13 @@ public abstract class ChromeFeatureList {
                     sUseLibunwindstackNativeUnwinderAndroid,
                     sVerticalAutomotiveBackButtonToolbar);
 
@@ -853,7 +829,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -517,4 +517,5 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
+@@ -450,4 +450,5 @@ BASE_FEATURE(kStopLoadingAnimationForHiddenWindow,
              "StopLoadingAnimationForHiddenWindow",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -862,25 +838,12 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1674,4 +1674,5 @@ BASE_FEATURE(kEventBasedLogUpload,
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1735,4 +1735,5 @@ BASE_FEATURE(kSupportsRtcWakeOver24Hours,
+              base::FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
 +#include "cromite_flags/chrome_common_chrome_features_cc.inc"
 }  // namespace features
-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
-@@ -5,7 +5,8 @@ Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
- -->
- 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-+                  xmlns:app="http://schemas.android.com/apk/res-auto">
- 
-     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-         android:key="enable_accessibility"
 diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/components/browser_ui/settings/android/java/res/values/attrs.xml
 --- a/components/browser_ui/settings/android/java/res/values/attrs.xml
 +++ b/components/browser_ui/settings/android/java/res/values/attrs.xml
@@ -905,10 +868,10 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 +import androidx.annotation.Nullable;
 +import android.content.res.TypedArray;
 +
- import androidx.annotation.ColorInt;
- import androidx.annotation.Nullable;
- import androidx.annotation.VisibleForTesting;
-@@ -31,6 +34,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+ import androidx.annotation.ColorRes;
+ import androidx.appcompat.content.res.AppCompatResources;
+ import androidx.preference.PreferenceViewHolder;
+@@ -30,6 +33,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
     /** Indicates if the preference uses a custom layout. */
     private final boolean mHasCustomLayout;
 
@@ -920,10 +883,10 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
     // TOOD(crbug.com/1451550): This is an interim solution. In the long-term, we should migrate
     // away from a switch with dynamically changing summaries onto a radio group.
     /**
-@@ -50,6 +58,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+@@ -46,6 +54,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+         super(context, attrs);
 
         mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs);
-         mUseSummaryAsTitle = true;
 +        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ChromeBasePreference);
 +        mFeatureName = a.getString(R.styleable.ChromeBasePreference_featureName);
 +        mNeedRestart = a.getBoolean(R.styleable.ChromeBasePreference_needRestart, false);
@@ -938,7 +901,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 +        return mNeedRestart;
     }
 
-     /**
+     /** Sets the ManagedPreferenceDelegate which will determine whether this preference is managed. */
 diff --git a/components/components_strings.grd b/components/components_strings.grd
 --- a/components/components_strings.grd
 +++ b/components/components_strings.grd
@@ -947,15 +910,15 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
       <part file="webapps_strings.grdp" />
       <part file="user_scripts/strings/userscripts_strings.grdp" />
 +      <part file="cromite_components_strings_grd/placeholder.txt"/>
-       <part file="history_clusters_strings.grdp" />
-       <if expr="is_android">
-         <part file="android_system_error_page_strings.grdp" />
+ 
+       <if expr="use_blink">
+         <part file="history_clusters_strings.grdp" />
 diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
 --- a/components/content_settings/core/common/features.cc
 +++ b/components/content_settings/core/common/features.cc
-@@ -113,5 +113,6 @@ BASE_FEATURE(kIndexedHostContentSettingsMap,
+@@ -112,5 +112,6 @@ BASE_FEATURE(kIndexedHostContentSettingsMap,
              "IndexedHostContentSettingsMap",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/components_content_settings_core_common_features_cc.inc"
 }  // namespace features
@@ -969,7 +932,7 @@ new file mode 100644
 diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc
 --- a/components/flags_ui/flags_state.cc
 +++ b/components/flags_ui/flags_state.cc
-@@ -359,7 +359,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
+@@ -359,7 +359,22 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
 
   for (const std::string& entry_name : enabled_entries) {
     const auto& entry_it = name_to_switch_map.find(entry_name);
@@ -987,14 +950,15 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +          continue;
 +        }
 +      }
-+      NOTREACHED_NORETURN();
+      NOTREACHED();
+      continue;
 +    }
 
     const SwitchEntry& entry = entry_it->second;
     if (!entry.switch_name.empty())
-@@ -676,6 +690,27 @@ void FlagsState::GetFlagFeatureEntries(
-       data.Set("links", std::move(links));
-     }
+@@ -668,6 +683,27 @@ void FlagsState::GetFlagFeatureEntries(
+     bool is_default_value = IsDefaultValue(entry, enabled_entries);
+     data.Set("is_default", is_default_value);
 
 +    if (entry.type == FeatureEntry::FEATURE_VALUE
 +        || entry.type == FeatureEntry::FEATURE_WITH_PARAMS_VALUE) {
@@ -1020,7 +984,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
     switch (entry.type) {
       case FeatureEntry::SINGLE_VALUE:
       case FeatureEntry::SINGLE_DISABLE_VALUE:
-@@ -804,6 +839,16 @@ void FlagsState::AddSwitchesToCommandLine(
+@@ -796,6 +832,16 @@ void FlagsState::AddSwitchesToCommandLine(
   for (const std::string& entry_name : enabled_entries) {
     const auto& entry_it = name_to_switch_map.find(entry_name);
     if (entry_it == name_to_switch_map.end()) {
@@ -1034,10 +998,10 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +          continue;
 +        }
 +      }
-       NOTREACHED_IN_MIGRATION();
+       NOTREACHED();
       continue;
     }
-@@ -1056,6 +1101,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
+@@ -1048,6 +1094,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
 bool FlagsState::IsSupportedFeature(const FlagsStorage* storage,
                                     const std::string& name,
                                     int platform_mask) const {
@@ -1135,7 +1099,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
   private announceStatusDelayMs: number = 100;
   private featuresResolver: PromiseResolver<void> = new PromiseResolver();
   private flagSearch: FlagSearch = new FlagSearch(this);
-@@ -209,6 +210,10 @@ export class FlagsAppElement extends CustomElement {
+@@ -205,6 +206,10 @@ export class FlagsAppElement extends CustomElement {
   // </if>
 
   tabs: Tab[] = [
@@ -1146,7 +1110,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
     {
       tabEl: this.getRequiredElement('#tab-available'),
       panelEl: this.getRequiredElement('#tab-content-available'),
-@@ -222,6 +227,11 @@ export class FlagsAppElement extends CustomElement {
+@@ -218,6 +223,11 @@ export class FlagsAppElement extends CustomElement {
   ];
 
   connectedCallback() {
@@ -1155,10 +1119,10 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
 +      this.getRequiredElement("#appcontainer").classList.add('cromite');
 +      document.title = "Cromite Flags List";
 +    }
-     // <if expr="not is_ios">
-     const pathname = new URL(window.location.href).pathname;
-     this.isFlagsDeprecatedUrl_ =
-@@ -306,20 +316,29 @@ export class FlagsAppElement extends CustomElement {
+     // Get and display the data upon loading.
+     this.requestExperimentalFeaturesData();
+     // There is no restart button on iOS.
+@@ -278,20 +288,29 @@ export class FlagsAppElement extends CustomElement {
     const defaultFeatures: Feature[] = [];
     const nonDefaultFeatures: Feature[] = [];
 
@@ -1191,7 +1155,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
     // </if>
 
     this.showRestartToast(experimentalFeaturesData.needsRestart);
-@@ -438,16 +457,23 @@ export class FlagsAppElement extends CustomElement {
+@@ -402,16 +421,23 @@ export class FlagsAppElement extends CustomElement {
   }
 
   private renderExperiments(
@@ -1216,7 +1180,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
       if (select) {
         experiment.addEventListener('select-change', e => {
           e.preventDefault();
-@@ -471,9 +497,14 @@ export class FlagsAppElement extends CustomElement {
+@@ -435,9 +461,14 @@ export class FlagsAppElement extends CustomElement {
           this.showRestartToast(true);
         });
       }
@@ -1302,7 +1266,7 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
 
     const description = this.getRequiredElement('.description');
     description.textContent = feature.description;
-@@ -134,6 +145,7 @@ export class FlagsExperimentElement extends CustomElement {
+@@ -125,6 +136,7 @@ export class FlagsExperimentElement extends CustomElement {
     const permalink = this.getRequiredElement<HTMLAnchorElement>('.permalink');
     permalink.href = `#${feature.internal_name}`;
     permalink.textContent = `#${feature.internal_name}`;
@@ -1310,7 +1274,7 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
 
     const smallScreenCheck = window.matchMedia('(max-width: 480px)');
     // Toggling of experiment description overflow content on smaller screens.
-@@ -162,6 +174,10 @@ export class FlagsExperimentElement extends CustomElement {
+@@ -153,6 +165,10 @@ export class FlagsExperimentElement extends CustomElement {
         const optionEl = document.createElement('option');
         optionEl.selected = option.selected;
         optionEl.textContent = option.description;
@@ -1339,7 +1303,7 @@ diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/f
 diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
 --- a/components/offline_pages/core/offline_page_feature.cc
 +++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
+@@ -55,4 +55,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
 }
 
@@ -1348,7 +1312,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/
 diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
 --- a/components/offline_pages/core/offline_page_feature.h
 +++ b/components/offline_pages/core/offline_page_feature.h
-@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
+@@ -50,6 +50,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
 // offline pages to avoid showing them even when the device is online.
 bool IsOfflinePagesNetworkStateLikelyUnknown();
 
@@ -1359,7 +1323,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -149,6 +149,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
+@@ -139,6 +139,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
              "CpssQuietChipTextUpdate",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -1382,7 +1346,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
-@@ -579,4 +579,5 @@ BASE_FEATURE(kWindowOpenFileSelectFix,
+@@ -596,4 +596,5 @@ BASE_FEATURE(kWindowOpenFileSelectFix,
 
 // Please keep features in alphabetical order.
 
@@ -1391,7 +1355,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1295,4 +1295,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
+@@ -1389,4 +1389,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
          VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
 }
 
@@ -1400,7 +1364,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -286,6 +286,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
+@@ -332,6 +332,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcPipeWireCapturer);
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
 
@@ -1698,7 +1662,7 @@ new file mode 100755
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -1904,5 +1904,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -1860,5 +1860,5 @@ uint32_t GetPassthroughAudioFormats() {
   return 0;
 #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
 }
@@ -1708,7 +1672,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -576,5 +576,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
+@@ -547,5 +547,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
 MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
 
 }  // namespace media
@@ -1718,8 +1682,8 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -550,4 +550,5 @@ BASE_FEATURE(kSpdySessionForProxyAdditionalChecks,
-              "SpdySessionForProxyAdditionalChecks",
+@@ -535,4 +535,5 @@ BASE_FEATURE(kTruncateBodyToContentLength,
+              "TruncateBodyToContentLength",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +#include "cromite_flags/net_base_features_cc.inc"
@@ -1727,9 +1691,9 @@ diff --git a/net/base/features.cc b/net/base/features.cc
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -522,6 +522,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kStorageAccessHeaders);
- // not causing any problems.
- NET_EXPORT BASE_DECLARE_FEATURE(kSpdySessionForProxyAdditionalChecks);
+@@ -523,6 +523,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kTreatHTTPExpiresHeaderValueZeroAsExpired);
+ // Enables truncating the response body to the content length.
+ NET_EXPORT BASE_DECLARE_FEATURE(kTruncateBodyToContentLength);
 
 +#include "cromite_flags/net_base_features_h.inc"
 }  // namespace net::features
@@ -1738,28 +1702,28 @@ diff --git a/net/base/features.h b/net/base/features.h
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -518,4 +518,5 @@ const base::FeatureParam<int> kNetworkContextPrefetchMaxLoaders{
-     &kNetworkContextPrefetch,
-     /*name=*/"max_loaders", /*default_value=*/10};
+@@ -467,4 +467,5 @@ const base::FeatureParam<bool> kSkipTpcdMitigationsForAdsTopLevelTrial{
+     /*name=*/"SkipTpcdMitigationsForAdsTopLevelTrial",
+     /*default_value=*/false};
 
 +#include "cromite_flags/services_network_public_cpp_features_cc.inc"
 }  // namespace network::features
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -212,6 +212,7 @@ BASE_DECLARE_FEATURE(kNetworkContextPrefetch);
+@@ -187,6 +187,7 @@ extern const base::FeatureParam<bool> kSkipTpcdMitigationsForAdsTrial;
 COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::FeatureParam<int> kNetworkContextPrefetchMaxLoaders;
+ extern const base::FeatureParam<bool> kSkipTpcdMitigationsForAdsTopLevelTrial;
 
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
- }  // namespace network::features
+ }  // namespace features
+ }  // namespace network
 
- #endif  // SERVICES_NETWORK_PUBLIC_CPP_FEATURES_H_
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2678,5 +2678,6 @@ BASE_FEATURE(kOptimizeLoadingDataUrls,
-              "OptimizeLoadingDataUrls",
+@@ -2546,5 +2546,6 @@ BASE_FEATURE(kSimplifyLoadingTransparentPlaceholderImage,
+              "SimplifyLoadingTransparentPlaceholderImage",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/third_party_blink_common_features_cc.inc"
@@ -1768,9 +1732,9 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
 --- a/third_party/blink/public/common/features.h
 +++ b/third_party/blink/public/common/features.h
-@@ -1747,6 +1747,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRenderSizeInScoreAdBrowserSignals);
- // Optimize loading data: URLs.
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kOptimizeLoadingDataUrls);
+@@ -1638,6 +1638,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kInteractiveDetectorIgnoreFcp);
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(
+     kSimplifyLoadingTransparentPlaceholderImage);
 
 +#include "cromite_flags/third_party_blink_common_features_h.inc"
 }  // namespace features
@@ -26,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -59,6 +59,16 @@ found in the LICENSE file.
+@@ -43,6 +43,16 @@ found in the LICENSE file.
         android:key="do_not_track"
         android:title="@string/do_not_track_title"
         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -52,6 +52,9 @@ import java.lang.annotation.Retention;
+@@ -55,6 +55,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Set;
 
@@ -56,7 +56,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.
-@@ -239,6 +242,9 @@ public class LaunchIntentDispatcher {
+@@ -244,6 +247,9 @@ public class LaunchIntentDispatcher {
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
         Log.w(
                 TAG,
                 "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -260,6 +266,10 @@ public class LaunchIntentDispatcher {
+@@ -265,6 +271,10 @@ public class LaunchIntentDispatcher {
         newIntent.setData(uri);
         newIntent.setClassName(context, CustomTabActivity.class.getName());
 
@@ -77,7 +77,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());
-@@ -407,6 +417,17 @@ public class LaunchIntentDispatcher {
+@@ -410,6 +420,17 @@ public class LaunchIntentDispatcher {
 
         if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                 && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -98,7 +98,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/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -867,6 +867,7 @@ public class CustomTabsConnection {
+@@ -850,6 +850,7 @@ public class CustomTabsConnection {
         PostTask.postTask(
                 TaskTraits.UI_DEFAULT,
                 () -> {
@@ -109,7 +109,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
-@@ -40,6 +40,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -38,6 +38,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -117,9 +117,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
 +
 /**
-  * A model class that parses the incoming intent for incognito and ephemeral Custom Tabs specific
-  * customization data.
-@@ -130,6 +133,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+  * A model class that parses the incoming intent for incognito Custom Tabs specific customization
+  * data.
+@@ -115,6 +118,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     private static boolean isIntentFromThirdPartyAllowed() {
@@ -132,9 +132,9 @@ 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
-@@ -101,6 +101,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -96,6 +96,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
     private IncognitoLockSettings mIncognitoLockSettings;
-     private SettingsLauncher mSettingsLauncher;
 
 +    private ChromeSwitchPreference allowCustomTabIntentsPref;
 +    private ChromeSwitchPreference openExternalLinksPref;
@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         getActivity().setTitle(R.string.prefs_privacy_security);
-@@ -319,6 +322,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -274,6 +277,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
     }
 
@@ -152,7 +152,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();
-@@ -335,6 +341,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -290,6 +296,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -357,6 +371,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -312,6 +326,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -203,7 +203,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
 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
-@@ -5454,6 +5454,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -5152,6 +5152,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
       <message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
          Resume
       </message>
@@ -10,13 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../org/chromium/chrome/browser/ApplicationLifetime.java    | 2 ++
 .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
 .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
+ .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
 .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 5 files changed, 21 insertions(+)
+ 6 files changed, 26 insertions(+), 1 deletion(-)

 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -160,6 +160,9 @@ found in the LICENSE file.
+@@ -166,6 +166,9 @@ found in the LICENSE file.
         <item android:id="@+id/managed_by_menu_id"
             android:title="@string/managed_browser"
             android:icon="@drawable/ic_business" />
@@ -26,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
     </group>
 
     <!-- Items shown only in the tab switcher -->
-@@ -186,6 +189,9 @@ found in the LICENSE file.
+@@ -192,6 +195,9 @@ found in the LICENSE file.
         <item android:id="@id/preferences_id"
             android:title="@string/menu_settings"
             android:icon="@drawable/settings_cog" />
@@ -58,8 +59,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife
 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
-@@ -268,6 +268,8 @@ import java.util.Set;
- import java.util.concurrent.atomic.AtomicBoolean;
+@@ -267,6 +267,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.function.BooleanSupplier;
 import java.util.function.DoubleConsumer;
 
 +import org.chromium.chrome.browser.ApplicationLifetime;
@@ -67,9 +68,9 @@ 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.
-@@ -2960,6 +2962,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2925,6 +2927,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
         } else if (id == R.id.close_tab) {
-             getCurrentTabModel().closeTab(currentTab, false, true);
+             getCurrentTabModel().closeTab(currentTab, true, false, true);
             RecordUserAction.record("MobileTabClosed");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
@@ -87,7 +88,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;
-@@ -2597,6 +2598,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2576,6 +2577,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             return true;
         }
 
@@ -99,10 +100,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
         if (id == R.id.update_menu_id) {
             UpdateMenuItemHelper.getInstance(
                             getProfileProviderSupplier().get().getOriginalProfile())
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
+@@ -81,7 +81,11 @@ class ChromeLifetimeController
+ 
+         // Kick off a timer to kill the process after a delay, which fires only if the Activities
+         // take too long to be finished.
+-        mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
+        if (restart) {
+            mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
+        } else {
+            fireBrowserRestartActivityIntent();
+        }
+     }
+ 
+     @Override
 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
-@@ -4063,6 +4063,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3745,6 +3745,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
       <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
         Dark theme
       </message>
@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 #include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/functional/bind.h"
-@@ -500,6 +501,15 @@ AutocompleteController::AutocompleteController(
+@@ -392,6 +393,15 @@ AutocompleteController::AutocompleteController(
           provider_client_->GetOmniboxTriggeredFeatureService()),
       steady_state_omnibox_position_(
           metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -45,7 +45,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -479,6 +479,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"
-@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -644,6 +645,9 @@ void SearchProvider::Run(bool query_is_private) {
 }
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -79,8 +79,8 @@ 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
-@@ -9,6 +9,8 @@
- #include <string_view>
+@@ -7,6 +7,8 @@
+ #include <stddef.h>
 
 #include "base/check_op.h"
 +#include "base/containers/contains.h"
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/char_iterator.h"
-@@ -620,6 +622,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -621,6 +623,8 @@ GURL FixupURLInternal(const std::string& text,
 
     FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
     if (chrome_url && !parts.host.is_valid())
@@ -92,7 +92,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -26,6 +26,10 @@
+@@ -22,6 +22,10 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/connect_job.h"
@@ -103,7 +103,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 #include "net/ssl/ssl_config.h"
 #include "url/gurl.h"
 #include "url/scheme_host_port.h"
-@@ -172,6 +176,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -168,6 +172,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
 int ClientSocketPoolManager::max_sockets_per_group(
     HttpNetworkSession::SocketPoolType pool_type) {
   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
@@ -45,7 +45,7 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1047,6 +1047,7 @@ component("net") {
+@@ -1030,6 +1030,7 @@ component("net") {
     "//build:chromeos_buildflags",
     "//components/miracle_parameter/common",
     "//net/http:transport_security_state_generated_files",
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
-@@ -1429,6 +1430,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1373,6 +1374,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
     return OK;
   }
 
@@ -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
-@@ -672,6 +672,10 @@
+@@ -635,6 +635,10 @@
       status: {"Android": "stable"},
       base_feature: "none",
     },
@@ -14,17 +14,16 @@ 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
-@@ -1920,7 +1920,6 @@ config("default_warnings") {
-         # TODO(crbug.com/40284799): Fix and re-enable.
+@@ -1889,13 +1889,21 @@ config("default_warnings") {
+         # TODO(https://crbug.com/1490607): Fix and re-enable.
         "-Wno-thread-safety-reference-return",
       ]
 -
-       cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
-@@ -1937,6 +1936,15 @@ config("default_warnings") {
-           cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
-         }
+       if (!is_nacl) {
+         cflags_cc += [
+           # TODO(https://crbug.com/1513724): Fix and re-enable.
+           "-Wno-c++11-narrowing-const-reference",
+         ]
       }
 +      if (skip_clangd_unsupported_options) {
 +        cflags -= [
@@ -41,7 +40,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -54,6 +54,9 @@ declare_args() {
+@@ -62,6 +62,9 @@ declare_args() {
   # to lack of toolchain support.
   gtest_enable_absl_printers = !is_nacl
 
@@ -49,6 +48,6 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 +  skip_clangd_unsupported_options = false
 +
   # Allow projects that wish to stay on C++17 to override Chromium's default.
-   # TODO(crbug.com/40251117): evaluate removing this end of 2023
+   # TODO(crbug.com/1402249): evaluate removing this end of 2023
   use_cxx17 = false
 --
@@ -57,7 +57,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../one_time_permissions_tracker.h            |  5 +-
 .../one_time_permissions_tracker_factory.cc   |  2 +-
 .../permissions/embedded_permission_prompt.cc |  2 +-
- ...exclusive_access_permission_prompt_view.cc |  2 +-
 .../permission_prompt_bubble_base_view.cc     |  2 +-
 .../site_settings/PermissionInfo.java         |  1 +
 .../site_settings/SingleWebsiteSettings.java  |  9 ++
@@ -65,7 +64,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../strings/android/browser_ui_strings.grd    |  5 ++
 .../core/browser/content_settings_utils.cc    | 36 ++++++++
 .../core/browser/content_settings_utils.h     |  6 ++
- .../core/common/content_settings_enums.mojom  |  9 ++
+ .../common/content_settings_constraints.h     |  9 ++
 .../page_info/PageInfoController.java         |  4 +-
 .../PermissionParamsListBuilder.java          | 13 ++-
 .../android/page_info_controller_android.cc   | 10 ++-
@@ -87,7 +86,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/permissions/permission_request.h   | 16 +++-
 .../permissions/permission_request_manager.cc | 45 ++++++----
 .../permissions/permission_request_manager.h  | 11 ++-
- 35 files changed, 489 insertions(+), 62 deletions(-)
+ 34 files changed, 488 insertions(+), 61 deletions(-)

 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -107,12 +106,12 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/br
 +                             ContentSettingsType type) {
 +    ContentSettingsForOneType session_settings =
 +      content_settings->GetSettingsForOneType(
-+          type, content_settings::mojom::SessionModel::USER_SESSION);
+          type, content_settings::SessionModel::UserSession);
 +
 +    GURL url = origin.GetURL();
 +    for (ContentSettingPatternSource& entry : session_settings) {
 +      if (content_settings::IsConstraintSessionExpiration(entry,
-+              content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED) &&
+              content_settings::LifetimeMode::UntilOriginClosed) &&
 +          entry.primary_pattern.Matches(url)) {
 +        content_settings->SetWebsiteSettingCustomScope(
 +            entry.primary_pattern, entry.secondary_pattern,
@@ -154,12 +153,12 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
 +                             ContentSettingsType type) {
 +    ContentSettingsForOneType session_settings =
 +      content_settings->GetSettingsForOneType(
-+          type, content_settings::mojom::SessionModel::USER_SESSION);
+          type, content_settings::SessionModel::UserSession);
 +
 +    GURL url = origin.GetURL();
 +    for (ContentSettingPatternSource& entry : session_settings) {
 +      if (content_settings::IsConstraintSessionExpiration(entry,
-+              content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED) &&
+              content_settings::LifetimeMode::UntilOriginClosed) &&
 +          entry.primary_pattern.Matches(url)) {
 +        content_settings->SetWebsiteSettingCustomScope(
 +            entry.primary_pattern, entry.secondary_pattern,
@@ -229,36 +228,24 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
 +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
-@@ -658,7 +658,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) {
-       delegate_->Accept();
-       break;
-     case Action::kAllowThisTime:
-      delegate_->AcceptThisTime();
-+      delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
-       break;
-     case Action::kDeny:
-       delegate_->Deny();
-diff --git a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
--- a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
-+++ b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
-@@ -99,7 +99,7 @@ void ExclusiveAccessPermissionPromptView::RunButtonCallback(int button_id) {
-   }
-   ButtonType button = GetButtonType(button_id);
-   if (button == ButtonType::kAllowThisTime) {
-    delegate_->AcceptThisTime();
-+    delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
-   } else if (button == ButtonType::kAlwaysAllow) {
-     delegate_->Accept();
-   } else if (button == ButtonType::kNeverAllow) {
+@@ -237,7 +237,7 @@ void EmbeddedPermissionPrompt::Allow() {
+ }
+ 
+ void EmbeddedPermissionPrompt::AllowThisTime() {
+-  delegate_->AcceptThisTime();
+  delegate_->AcceptThisTime(content_settings::LifetimeMode::OnlyThisTime);
+   CloseCurrentViewAndMaybeShowNext(/*first_prompt=*/false);
+ }
+ 
 diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
-@@ -241,7 +241,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallback(int button_id) {
+@@ -267,7 +267,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallback(int button_id) {
       delegate_->Accept();
       return;
     case PermissionDialogButton::kAcceptOnce:
 -      delegate_->AcceptThisTime();
-+      delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
+      delegate_->AcceptThisTime(content_settings::LifetimeMode::OnlyThisTime);
       return;
     case PermissionDialogButton::kDeny:
       delegate_->Deny();
@@ -276,7 +263,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -561,6 +561,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -559,6 +559,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
         }
     }
 
@@ -288,9 +275,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
     private void setUpClearDataPreference() {
         ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
         long usage = mSite.getTotalUsage();
-@@ -1091,6 +1096,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-                     AppCompatResources.getColorStateList(getContext(), mHighlightColor)
-                             .getDefaultColor());
+@@ -1070,6 +1075,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+         if (contentType == mHighlightedPermission) {
+             switchPreference.setBackgroundColor(mHighlightColor);
         }
 +        if (isSessionPermission(contentType)) {
 +            switchPreference.setSummary(switchPreference.getSummary() + " " +
@@ -302,7 +289,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
 --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
 +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
-@@ -199,7 +199,7 @@ void GetOrigins(JNIEnv* env,
+@@ -198,7 +198,7 @@ void GetOrigins(JNIEnv* env,
       seen_origins.push_back(origin);
       insertionFunc(env, static_cast<int>(content_type), list,
                     ConvertOriginToJavaString(env, origin), jembedder,
@@ -314,7 +301,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -651,6 +651,11 @@
+@@ -673,6 +673,11 @@
       <message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
         URL truncated
       </message>
@@ -329,41 +316,41 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -155,6 +155,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
-   return constraints.session_model() == mojom::SessionModel::DURABLE;
+@@ -174,6 +174,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
+   return constraints.session_model() == SessionModel::Durable;
 }
 
-+ContentSettingConstraints GetConstraintSessionExpiration(content_settings::mojom::LifetimeMode lifetime_mode) {
+ContentSettingConstraints GetConstraintSessionExpiration(LifetimeMode lifetime_mode) {
 +  int lifetime;
 +  base::Time now;
-+  if (lifetime_mode == content_settings::mojom::LifetimeMode::ONLY_THIS_TIME) {
+  if (lifetime_mode == LifetimeMode::OnlyThisTime) {
 +    // note: this content settings will be discarded immediately
 +    // 1h is used as a magic constant to identify the one-time lifetime mode
 +    lifetime = 1;
-+  } else if (lifetime_mode == content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED) {
+  } else if (lifetime_mode == LifetimeMode::UntilOriginClosed) {
 +    now = base::Time::Now();
 +    lifetime = 24;
 +  } else {
 +    lifetime = 0;
 +  }
-+  ContentSettingConstraints c(now);
+  content_settings::ContentSettingConstraints c(now);
 +  c.set_lifetime(base::Hours(lifetime));
-+  c.set_session_model(mojom::SessionModel::USER_SESSION);
+  c.set_session_model(content_settings::SessionModel::UserSession);
 +  return c;
 +}
 +
 +bool IsConstraintSessionExpiration(const ContentSettingPatternSource& source,
-+                                   content_settings::mojom::LifetimeMode lifetime_mode) {
-+  if (source.metadata.session_model() != content_settings::mojom::SessionModel::USER_SESSION)
+                                   LifetimeMode lifetime_mode) {
+  if (source.metadata.session_model() != content_settings::SessionModel::UserSession)
 +    return false;
 +
-+  mojom::LifetimeMode type;
+  LifetimeMode type;
 +  if (source.metadata.lifetime() == base::Hours(24)) {
-+    type = content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED;
+    type = LifetimeMode::UntilOriginClosed;
 +  } else if (source.metadata.expiration() == (base::Time() + base::Hours(1))) {
-+    type = content_settings::mojom::LifetimeMode::ONLY_THIS_TIME;
+    type = LifetimeMode::OnlyThisTime;
 +  } else {
-+    type = content_settings::mojom::LifetimeMode::UNTIL_BROWSER_CLOSED;
+    type = LifetimeMode::UntilBrowserClosed;
 +  }
 +
 +  return lifetime_mode == type;
@@ -375,42 +362,42 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
 --- a/components/content_settings/core/browser/content_settings_utils.h
 +++ b/components/content_settings/core/browser/content_settings_utils.h
-@@ -74,6 +74,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
+@@ -73,6 +73,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
 // Returns whether the given type supports tracking last_visit timestamps.
 bool CanTrackLastVisit(ContentSettingsType type);
 
-+ContentSettingConstraints GetConstraintSessionExpiration(mojom::LifetimeMode lifetime_mode);
+ContentSettingConstraints GetConstraintSessionExpiration(LifetimeMode lifetime_mode);
 +
 +bool IsConstraintSessionExpiration(
 +    const ContentSettingPatternSource& source,
-+    mojom::LifetimeMode lifetime_mode);
+    LifetimeMode lifetime_mode);
 +
 // Get a timestamp with week-precision.
 base::Time GetCoarseVisitedTime(base::Time time);
 
-diff --git a/components/content_settings/core/common/content_settings_enums.mojom b/components/content_settings/core/common/content_settings_enums.mojom
--- a/components/content_settings/core/common/content_settings_enums.mojom
-+++ b/components/content_settings/core/common/content_settings_enums.mojom
-@@ -58,6 +58,15 @@ enum SessionModel {
-   ONE_TIME,
+diff --git a/components/content_settings/core/common/content_settings_constraints.h b/components/content_settings/core/common/content_settings_constraints.h
+--- a/components/content_settings/core/common/content_settings_constraints.h
+++ b/components/content_settings/core/common/content_settings_constraints.h
+@@ -33,6 +33,15 @@ enum class SessionModel : int32_t {
+   kMaxValue = OneTime,
 };
 
 +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
 +// GENERATED_JAVA_CLASS_NAME_OVERRIDE: LifetimeMode
-+enum LifetimeMode {
-+  ALWAYS = 99,
-+  ONLY_THIS_TIME = 1,
-+  UNTIL_ORIGIN_CLOSED = 2,
-+  UNTIL_BROWSER_CLOSED = 0,
+enum class LifetimeMode {
+  Always = 99,
+  OnlyThisTime = 1,
+  UntilOriginClosed = 2,
+  UntilBrowserClosed = 0,
 +};
 +
- // Identifies the content settings provider of a content setting.
- // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
- // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ProviderType
+ // Constraints to be applied when setting a content setting.
+ class ContentSettingConstraints {
+  public:
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
-@@ -422,9 +422,9 @@ public class PageInfoController
+@@ -378,9 +378,9 @@ public class PageInfoController
             String name,
             String nameMidSentence,
             int type,
@@ -468,7 +455,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
 --- a/components/page_info/android/page_info_controller_android.cc
 +++ b/components/page_info/android/page_info_controller_android.cc
-@@ -153,6 +153,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -154,6 +154,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
 
   std::map<ContentSettingsType, ContentSetting>
       user_specified_settings_to_display;
@@ -477,7 +464,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 
   for (const auto& permission : permission_info_list) {
     if (base::Contains(permissions_to_display, permission.type)) {
-@@ -161,6 +163,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -162,6 +164,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
       if (setting_to_display) {
         user_specified_settings_to_display[permission.type] =
             *setting_to_display;
@@ -486,7 +473,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
       }
     }
   }
-@@ -177,7 +181,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -178,7 +182,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
           ConvertUTF16ToJavaString(env, setting_title),
           ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
           static_cast<jint>(permission),
@@ -496,7 +483,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
     }
   }
 
-@@ -190,7 +195,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -191,7 +196,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
         env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
         ConvertUTF16ToJavaString(env, object_title),
         static_cast<jint>(chosen_object->ui_info->content_settings_type),
@@ -509,20 +496,20 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1171,6 +1171,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
-   permission_info.is_one_time =
-       (info.metadata.session_model() ==
-        content_settings::mojom::SessionModel::ONE_TIME);
+@@ -1163,6 +1163,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+   permission_info.source = info.source;
+   permission_info.is_one_time = (info.metadata.session_model() ==
+                                  content_settings::SessionModel::OneTime);
 +  permission_info.is_user_session =
-+      (info.metadata.session_model() == content_settings::mojom::SessionModel::USER_SESSION);
+      (info.metadata.session_model() == content_settings::SessionModel::UserSession);
 
   auto* page_specific_content_settings = GetPageSpecificContentSettings();
   if (page_specific_content_settings && setting == CONTENT_SETTING_ALLOW) {
 diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
-@@ -150,6 +150,7 @@ class PageInfo : private content_settings::CookieControlsObserver,
-         content_settings::SettingSource::kNone;
+@@ -199,6 +199,7 @@ class PageInfo : private content_settings::CookieControlsObserver {
+         content_settings::SETTING_SOURCE_NONE;
     // Whether the permission is a one-time grant.
     bool is_one_time = false;
 +    bool is_user_session = false;
@@ -540,8 +527,8 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 
 import java.util.ArrayList;
 import java.util.List;
-@@ -60,6 +61,9 @@ public class PermissionDialogDelegate {
-     /** The {@link ContentSettingsType}s requested in this dialog. */
+@@ -57,6 +58,9 @@ public class PermissionDialogDelegate {
+     /** The {@link ContentSettingsType}s requested in this dialog.  */
     private int[] mContentSettingsTypes;
 
 +    /** Lifetime option selected by the user. */
@@ -550,7 +537,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
     /**
      * Defines a (potentially empty) list of ranges represented as pairs of <startIndex, endIndex>,
      * which shall be used by the UI to format the specified ranges as bold text.
-@@ -117,6 +121,15 @@ public class PermissionDialogDelegate {
+@@ -110,6 +114,15 @@ public class PermissionDialogDelegate {
                 .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this);
     }
 
@@ -588,7 +575,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 /** This class creates the model for the permission dialog. */
 class PermissionDialogModelFactory {
     public static PropertyModel getModel(
-@@ -72,6 +84,74 @@ class PermissionDialogModelFactory {
+@@ -60,6 +72,74 @@ class PermissionDialogModelFactory {
                             ModalDialogProperties.NEGATIVE_BUTTON_TEXT,
                             delegate.getNegativeButtonText());
         }
@@ -667,7 +654,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
-@@ -159,6 +159,11 @@ void PermissionDialogJavaDelegate::DismissDialog() {
+@@ -144,6 +144,11 @@ void PermissionDialogJavaDelegate::DismissDialog() {
   Java_PermissionDialogDelegate_dismissFromNative(env, j_delegate_);
 }
 
@@ -679,27 +666,27 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 // static
 void PermissionDialogDelegate::Create(
     content::WebContents* web_contents,
-@@ -187,6 +192,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting(
+@@ -172,6 +177,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting(
 void PermissionDialogDelegate::Accept(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
-+  content_settings::mojom::LifetimeMode lifetimeOption =
-+    static_cast<content_settings::mojom::LifetimeMode>(
+  content_settings::LifetimeMode lifetimeOption =
+    static_cast<content_settings::LifetimeMode>(
 +      java_delegate_->GetSelectedLifetimeOption());
-+  if (lifetimeOption != content_settings::mojom::LifetimeMode::ALWAYS) {
+  if (lifetimeOption != content_settings::LifetimeMode::Always) {
 +    permission_prompt_->AcceptThisTime(lifetimeOption);
 +    return;
 +  }
   permission_prompt_->Accept();
 }
 
-@@ -194,12 +206,22 @@ void PermissionDialogDelegate::AcceptThisTime(
+@@ -179,12 +191,22 @@ void PermissionDialogDelegate::AcceptThisTime(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
 -  permission_prompt_->AcceptThisTime();
-+  content_settings::mojom::LifetimeMode lifetimeOption =
-+    static_cast<content_settings::mojom::LifetimeMode>(
+  content_settings::LifetimeMode lifetimeOption =
+    static_cast<content_settings::LifetimeMode>(
 +      java_delegate_->GetSelectedLifetimeOption());
 +  permission_prompt_->AcceptThisTime(lifetimeOption);
 }
@@ -707,10 +694,10 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 void PermissionDialogDelegate::Cancel(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
-+  content_settings::mojom::LifetimeMode lifetimeOption =
-+    static_cast<content_settings::mojom::LifetimeMode>(
+  content_settings::LifetimeMode lifetimeOption =
+    static_cast<content_settings::LifetimeMode>(
 +      java_delegate_->GetSelectedLifetimeOption());
-+  if (lifetimeOption != content_settings::mojom::LifetimeMode::ALWAYS) {
+  if (lifetimeOption != content_settings::LifetimeMode::Always) {
 +    permission_prompt_->DenyThisTime(lifetimeOption);
 +    return;
 +  }
@@ -731,17 +718,17 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.cc b/components/permissions/android/permission_prompt/permission_prompt_android.cc
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.cc
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.cc
-@@ -62,8 +62,12 @@ void PermissionPromptAndroid::Accept() {
+@@ -53,8 +53,12 @@ void PermissionPromptAndroid::Accept() {
   delegate_->Accept();
 }
 
 -void PermissionPromptAndroid::AcceptThisTime() {
 -  delegate_->AcceptThisTime();
-+void PermissionPromptAndroid::AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption) {
+void PermissionPromptAndroid::AcceptThisTime(content_settings::LifetimeMode lifetimeOption) {
 +  delegate_->AcceptThisTime(lifetimeOption);
 +}
 +
-+void PermissionPromptAndroid::DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption) {
+void PermissionPromptAndroid::DenyThisTime(content_settings::LifetimeMode lifetimeOption) {
 +  delegate_->DenyThisTime(lifetimeOption);
 }
 
@@ -749,14 +736,14 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.h
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h
-@@ -47,8 +47,9 @@ class PermissionPromptAndroid : public PermissionPrompt {
+@@ -44,8 +44,9 @@ class PermissionPromptAndroid : public PermissionPrompt {
 
   void Closing();
   void Accept();
 -  void AcceptThisTime();
-+  void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
+  void AcceptThisTime(content_settings::LifetimeMode lifetimeOption);
   void Deny();
-+  void DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
+  void DenyThisTime(content_settings::LifetimeMode lifetimeOption);
   void SetManageClicked();
   void SetLearnMoreClicked();
   bool ShouldCurrentRequestUseQuietUI();
@@ -796,7 +783,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
   DCHECK(is_final_decision);
 +  NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin,
 +    std::move(callback), persist, content_setting, is_one_time, is_final_decision,
-+    content_settings::mojom::LifetimeMode::ALWAYS);
+    content_settings::LifetimeMode::Always);
 +}
 
 +void GeolocationPermissionContextAndroid::NotifyPermissionSetWithLifetime(
@@ -807,7 +794,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +    bool persist,
 +    ContentSetting content_setting,
 +    bool is_one_time, bool is_final_decision,
-+    content_settings::mojom::LifetimeMode lifetime_option) {
+    content_settings::LifetimeMode lifetime_option) {
   bool is_default_search = IsRequestingOriginDSE(requesting_origin);
   if (content_setting == CONTENT_SETTING_ALLOW &&
       !location_settings_->IsSystemLocationSettingEnabled()) {
@@ -847,16 +834,16 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 }
 
 content::PermissionResult
-@@ -381,7 +396,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -377,7 +392,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
     const GURL& embedding_origin,
     bool persist,
     ContentSetting content_setting,
 -    bool is_one_time,
-+    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option,
+    bool is_one_time, content_settings::LifetimeMode lifetime_option,
     LocationSettingsDialogOutcome prompt_outcome) {
   bool is_default_search = IsRequestingOriginDSE(requesting_origin);
   if (prompt_outcome == GRANTED) {
-@@ -400,7 +415,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -396,7 +411,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
   FinishNotifyPermissionSet(location_settings_dialog_request_id_,
                             requesting_origin, embedding_origin,
                             std::move(location_settings_dialog_callback_),
@@ -866,13 +853,13 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 
   location_settings_dialog_request_id_ =
       PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
-@@ -414,10 +430,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+@@ -410,10 +426,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
     BrowserPermissionCallback callback,
     bool persist,
     ContentSetting content_setting,
 -    bool is_one_time) {
 -  GeolocationPermissionContext::NotifyPermissionSet(
-+    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
+    bool is_one_time, content_settings::LifetimeMode lifetime_option) {
 +  GeolocationPermissionContext::NotifyPermissionSetWithLifetime(
       id, requesting_origin, embedding_origin, std::move(callback), persist,
 -      content_setting, is_one_time, /*is_final_decision=*/true);
@@ -895,25 +882,25 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +                           ContentSetting content_setting,
 +                           bool is_one_time,
 +                           bool is_final_decision,
-+                           content_settings::mojom::LifetimeMode lifetime_option) override;
+                           content_settings::LifetimeMode lifetime_option) override;
   content::PermissionResult UpdatePermissionStatusWithDeviceStatus(
       content::PermissionResult result,
       const GURL& requesting_origin,
-@@ -133,6 +142,7 @@ class GeolocationPermissionContextAndroid
+@@ -132,6 +141,7 @@ class GeolocationPermissionContextAndroid
       bool persist,
       ContentSetting content_setting,
       bool is_one_time,
-+      content_settings::mojom::LifetimeMode lifetime_option,
+      content_settings::LifetimeMode lifetime_option,
       LocationSettingsDialogOutcome prompt_outcome);
 
   void FinishNotifyPermissionSet(const PermissionRequestID& id,
-@@ -141,7 +151,8 @@ class GeolocationPermissionContextAndroid
+@@ -140,7 +150,8 @@ class GeolocationPermissionContextAndroid
                                  BrowserPermissionCallback callback,
                                  bool persist,
                                  ContentSetting content_setting,
 -                                 bool is_one_time);
 +                                 bool is_one_time,
-+                                 content_settings::mojom::LifetimeMode lifetime_option);
+                                 content_settings::LifetimeMode lifetime_option);
 
   std::unique_ptr<LocationSettings> location_settings_;
 
@@ -938,17 +925,17 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 content::PermissionResult PermissionContextBase::GetPermissionStatus(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-@@ -501,7 +512,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -511,7 +522,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
                                               const GURL& embedding_origin,
                                               ContentSetting content_setting,
                                               bool is_one_time,
 -                                              bool is_final_decision) {
 +                                              bool is_final_decision,
-+                                              content_settings::mojom::LifetimeMode lifetime_option) {
+                                              content_settings::LifetimeMode lifetime_option) {
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK ||
          content_setting == CONTENT_SETTING_DEFAULT);
-@@ -516,13 +528,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -526,13 +538,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
   // missing if a permission prompt was preignored and we already notified an
   // origin about it.
   if (request->second.second) {
@@ -967,14 +954,14 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   }
 }
 
-@@ -590,11 +603,27 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -578,11 +591,27 @@ void PermissionContextBase::NotifyPermissionSet(
     ContentSetting content_setting,
     bool is_one_time,
     bool is_final_decision) {
 +  DCHECK(is_one_time == false);
 +  NotifyPermissionSetWithLifetime(id, requesting_origin, embedding_origin, std::move(callback),
 +     persist, content_setting, is_one_time, is_final_decision,
-+     content_settings::mojom::LifetimeMode::ALWAYS);
+     content_settings::LifetimeMode::Always);
 +}
 +
 +void PermissionContextBase::NotifyPermissionSetWithLifetime(
@@ -986,7 +973,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 +    ContentSetting content_setting,
 +    bool is_one_time,
 +    bool is_final_decision,
-+    content_settings::mojom::LifetimeMode lifetime_option) {
+    content_settings::LifetimeMode lifetime_option) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (persist) {
@@ -996,35 +983,35 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   }
 
   if (is_final_decision) {
-@@ -634,6 +663,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -612,6 +641,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                  const GURL& embedding_origin,
                                                  ContentSetting content_setting,
                                                  bool is_one_time) {
 +  UpdateContentSetting(requesting_origin, embedding_origin, content_setting,
-+    is_one_time, content_settings::mojom::LifetimeMode::ALWAYS);
+    is_one_time, content_settings::LifetimeMode::Always);
 +}
 +
 +void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
 +                                                 const GURL& embedding_origin,
 +                                                 ContentSetting content_setting,
 +                                                 bool is_one_time,
-+                                                 content_settings::mojom::LifetimeMode lifetime_option) {
+                                                 content_settings::LifetimeMode lifetime_option) {
   DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
   DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-@@ -643,6 +681,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
-   constraints.set_session_model(
-       is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
-                   : content_settings::mojom::SessionModel::DURABLE);
+@@ -621,6 +659,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+   constraints.set_session_model(is_one_time
+                                     ? content_settings::SessionModel::OneTime
+                                     : content_settings::SessionModel::Durable);
 +  if (is_one_time)
 +    constraints = content_settings::GetConstraintSessionExpiration(lifetime_option);
 
- #if BUILDFLAG(IS_ANDROID)
-   if (base::FeatureList::IsEnabled(
+ #if !BUILDFLAG(IS_ANDROID)
+   // The Permissions module in Safety check will revoke permissions after
 diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
 --- a/components/permissions/permission_context_base.h
 +++ b/components/permissions/permission_context_base.h
-@@ -163,6 +163,15 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -153,6 +153,15 @@ class PermissionContextBase : public content_settings::Observer {
 
   // Updates stored content setting if persist is set, updates tab indicators
   // and runs the callback to finish the request.
@@ -1036,11 +1023,11 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 +                                   ContentSetting content_setting,
 +                                   bool is_one_time,
 +                                   bool is_final_decision,
-+                                   content_settings::mojom::LifetimeMode lifetime_option);
+                                   content_settings::LifetimeMode lifetime_option);
   virtual void NotifyPermissionSet(const PermissionRequestID& id,
                                    const GURL& requesting_origin,
                                    const GURL& embedding_origin,
-@@ -184,6 +193,11 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -174,6 +183,11 @@ class PermissionContextBase : public content_settings::Observer {
   // Store the decided permission as a content setting.
   // virtual since the permission might be stored with different restrictions
   // (for example for desktop notifications).
@@ -1048,11 +1035,11 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 +                                    const GURL& embedding_origin,
 +                                    ContentSetting content_setting,
 +                                    bool is_one_time,
-+                                    content_settings::mojom::LifetimeMode lifetime_option);
+                                    content_settings::LifetimeMode lifetime_option);
   virtual void UpdateContentSetting(const GURL& requesting_origin,
                                     const GURL& embedding_origin,
                                     ContentSetting content_setting,
-@@ -217,6 +231,12 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -207,6 +221,12 @@ class PermissionContextBase : public content_settings::Observer {
   // Implementors can override this method to avoid using automatic embargo.
   virtual bool UsesAutomaticEmbargo() const;
 
@@ -1065,13 +1052,13 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
   base::ObserverList<permissions::Observer> permission_observers_;
 
   // Set by subclasses to inform the base class that they will handle adding
-@@ -240,7 +260,8 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -229,7 +249,8 @@ class PermissionContextBase : public content_settings::Observer {
                          const GURL& embedding_origin,
                          ContentSetting content_setting,
                          bool is_one_time,
 -                         bool is_final_decision);
 +                         bool is_final_decision,
-+                         content_settings::mojom::LifetimeMode lifetime_option);
+                         content_settings::LifetimeMode lifetime_option);
 
   void NotifyObservers(const ContentSettingsPattern& primary_pattern,
                        const ContentSettingsPattern& secondary_pattern,
@@ -1083,9 +1070,9 @@ diff --git a/components/permissions/permission_prompt.h b/components/permissions
 
     virtual void Accept() = 0;
 -    virtual void AcceptThisTime() = 0;
-+    virtual void AcceptThisTime(content_settings::mojom::LifetimeMode lifetime_option) = 0;
+    virtual void AcceptThisTime(content_settings::LifetimeMode lifetime_option) = 0;
     virtual void Deny() = 0;
-+    virtual void DenyThisTime(content_settings::mojom::LifetimeMode lifetime_option) = 0;
+    virtual void DenyThisTime(content_settings::LifetimeMode lifetime_option) = 0;
     virtual void Dismiss() = 0;
     virtual void Ignore() = 0;
 
@@ -1107,13 +1094,13 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 PermissionRequest::~PermissionRequest() {
   DCHECK(delete_callback_.is_null());
 }
-@@ -370,19 +378,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
-   return request_type() == RequestType::kStorageAccess;
+@@ -357,19 +365,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+              permissions::features::kPermissionStorageAccessAPI);
 }
 
 -void PermissionRequest::PermissionGranted(bool is_one_time) {
 +void PermissionRequest::PermissionGranted(bool is_one_time,
-+                            content_settings::mojom::LifetimeMode lifetime_option) {
+                            content_settings::LifetimeMode lifetime_option) {
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
 +        .Run(CONTENT_SETTING_ALLOW, is_one_time, /*is_final_decision=*/true, lifetime_option);
@@ -1126,7 +1113,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 
 -void PermissionRequest::PermissionDenied() {
 +void PermissionRequest::PermissionDenied(bool is_one_time,
-+                            content_settings::mojom::LifetimeMode lifetime_option) {
+                            content_settings::LifetimeMode lifetime_option) {
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
 +        .Run(CONTENT_SETTING_BLOCK, is_one_time, /*is_final_decision=*/true, lifetime_option);
@@ -1141,7 +1128,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
 +        .Run(CONTENT_SETTING_DEFAULT, false, is_final_decision,
-+             content_settings::mojom::LifetimeMode::ALWAYS);
+             content_settings::LifetimeMode::Always);
 +    return;
 +  }
   if (permission_decided_callback_) {
@@ -1157,7 +1144,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
 +  using PermissionDecidedCallbackWithLifetime =
 +      base::OnceCallback<void(ContentSetting /*result*/, bool /*is_one_time*/,
 +        bool /*is_final_decision*/,
-+        content_settings::mojom::LifetimeMode /*lifetime_option*/)>;
+        content_settings::LifetimeMode /*lifetime_option*/)>;
 +
   // `permission_decided_callback` is called when the permission request is
   // resolved by the user (see comment on PermissionDecidedCallback above).
@@ -1173,20 +1160,20 @@ diff --git a/components/permissions/permission_request.h b/components/permission
   PermissionRequest(const PermissionRequest&) = delete;
   PermissionRequest& operator=(const PermissionRequest&) = delete;
 
-@@ -162,10 +171,10 @@ class PermissionRequest {
+@@ -159,10 +168,10 @@ class PermissionRequest {
   // If |is_one_time| is true the permission will last until all tabs of
   // |origin| are closed or navigated away from, and then the permission will
   // automatically expire after 1 day.
 -  void PermissionGranted(bool is_one_time);
-+  void PermissionGranted(bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option);
+  void PermissionGranted(bool is_one_time, content_settings::LifetimeMode lifetime_option);
 
   // Called when the user has denied the requested permission.
 -  void PermissionDenied();
-+  void PermissionDenied(bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option);
+  void PermissionDenied(bool is_one_time, content_settings::LifetimeMode lifetime_option);
 
   // Called when the user has cancelled the permission request. This
   // corresponds to a denial, but is segregated in case the context needs to
-@@ -221,6 +230,9 @@ class PermissionRequest {
+@@ -216,6 +225,9 @@ class PermissionRequest {
   // Called once a decision is made about the permission.
   PermissionDecidedCallback permission_decided_callback_;
 
@@ -1199,44 +1186,44 @@ diff --git a/components/permissions/permission_request.h b/components/permission
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -169,7 +169,7 @@ void PermissionRequestManager::AddRequest(
+@@ -156,7 +156,7 @@ void PermissionRequestManager::AddRequest(
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDenyPermissionPrompts)) {
 -    request->PermissionDenied();
-+    request->PermissionDenied(/*is_one_time*/false, content_settings::mojom::LifetimeMode::ALWAYS);
+    request->PermissionDenied(/*is_one_time*/false, content_settings::LifetimeMode::Always);
     request->RequestFinished();
     return;
   }
-@@ -246,7 +246,7 @@ void PermissionRequestManager::AddRequest(
- 
-   if (should_auto_approve_request) {
-     if (should_auto_approve_request == PermissionAction::GRANTED) {
+@@ -232,7 +232,7 @@ void PermissionRequestManager::AddRequest(
+   if (auto_approval_origin) {
+     if (url::Origin::Create(request->requesting_origin()) ==
+         auto_approval_origin.value()) {
 -      request->PermissionGranted(/*is_one_time=*/false);
-+      request->PermissionGranted(/*is_one_time=*/false, content_settings::mojom::LifetimeMode::ALWAYS);
+      request->PermissionGranted(/*is_one_time=*/false, content_settings::LifetimeMode::Always);
     }
     request->RequestFinished();
     return;
-@@ -615,7 +615,8 @@ void PermissionRequestManager::Accept() {
+@@ -593,7 +593,8 @@ void PermissionRequestManager::Accept() {
                                 (*requests_iter)->request_type(),
                                 PermissionAction::GRANTED);
     PermissionGrantedIncludingDuplicates(*requests_iter,
 -                                         /*is_one_time=*/false);
 +                                         /*is_one_time=*/false,
-+                                         content_settings::mojom::LifetimeMode::ALWAYS);
+                                         content_settings::LifetimeMode::Always);
 
 #if !BUILDFLAG(IS_ANDROID)
     std::optional<ContentSettingsType> content_settings_type =
-@@ -633,7 +634,7 @@ void PermissionRequestManager::Accept() {
+@@ -611,7 +612,7 @@ void PermissionRequestManager::Accept() {
   CurrentRequestsDecided(PermissionAction::GRANTED);
 }
 
 -void PermissionRequestManager::AcceptThisTime() {
-+void PermissionRequestManager::AcceptThisTime(content_settings::mojom::LifetimeMode mode) {
+void PermissionRequestManager::AcceptThisTime(content_settings::LifetimeMode mode) {
   if (ignore_callbacks_from_prompt_)
     return;
   DCHECK(view_);
-@@ -645,7 +646,8 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -623,7 +624,8 @@ void PermissionRequestManager::AcceptThisTime() {
                                 (*requests_iter)->request_type(),
                                 PermissionAction::GRANTED_ONCE);
     PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1246,23 +1233,23 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
   }
 
   NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
-@@ -653,6 +655,15 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -631,6 +633,15 @@ void PermissionRequestManager::AcceptThisTime() {
 }
 
 void PermissionRequestManager::Deny() {
-+  Deny_(/*is_one_time*/ false, content_settings::mojom::LifetimeMode::ALWAYS);
+  Deny_(/*is_one_time*/ false, content_settings::LifetimeMode::Always);
 +}
 +
-+void PermissionRequestManager::DenyThisTime(content_settings::mojom::LifetimeMode mode) {
+void PermissionRequestManager::DenyThisTime(content_settings::LifetimeMode mode) {
 +  Deny_(/*is_one_time*/ true, mode);
 +}
 +
 +void PermissionRequestManager::Deny_(bool is_one_time,
-+                                     content_settings::mojom::LifetimeMode lifetime_option) {
+                                     content_settings::LifetimeMode lifetime_option) {
   if (ignore_callbacks_from_prompt_)
     return;
   DCHECK(view_);
-@@ -676,7 +687,7 @@ void PermissionRequestManager::Deny() {
+@@ -654,7 +665,7 @@ void PermissionRequestManager::Deny() {
     StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
                                 (*requests_iter)->request_type(),
                                 PermissionAction::DENIED);
@@ -1271,12 +1258,12 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
   }
 
   NotifyRequestDecided(PermissionAction::DENIED);
-@@ -1243,32 +1254,32 @@ PermissionRequestManager::VisitDuplicateRequests(
+@@ -1213,32 +1224,32 @@ PermissionRequestManager::VisitDuplicateRequests(
 
 void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
     PermissionRequest* request,
 -    bool is_one_time) {
-+    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
+    bool is_one_time, content_settings::LifetimeMode lifetime_option) {
   DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
                      pending_permission_requests_.Count(request))
       << "Only requests in [pending_permission_]requests_ can have duplicates";
@@ -1285,7 +1272,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
   VisitDuplicateRequests(
       base::BindRepeating(
 -          [](bool is_one_time,
-+          [](bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option,
+          [](bool is_one_time, content_settings::LifetimeMode lifetime_option,
              const base::WeakPtr<PermissionRequest>& weak_request) {
 -            weak_request->PermissionGranted(is_one_time);
 +            weak_request->PermissionGranted(is_one_time, lifetime_option);
@@ -1297,7 +1284,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 
 void PermissionRequestManager::PermissionDeniedIncludingDuplicates(
 -    PermissionRequest* request) {
-+    PermissionRequest* request, bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
+    PermissionRequest* request, bool is_one_time, content_settings::LifetimeMode lifetime_option) {
   DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
                      pending_permission_requests_.Count(request))
       << "Only requests in [pending_permission_]requests_ can have duplicates";
@@ -1308,18 +1295,18 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 -          [](const base::WeakPtr<PermissionRequest>& weak_request) {
 -            weak_request->PermissionDenied();
 -          }),
-+          [](bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option, const base::WeakPtr<PermissionRequest>& weak_request) {
+          [](bool is_one_time, content_settings::LifetimeMode lifetime_option, const base::WeakPtr<PermissionRequest>& weak_request) {
 +            weak_request->PermissionDenied(is_one_time, lifetime_option);
 +          }, is_one_time, lifetime_option),
       request);
 }
 
-@@ -1529,7 +1540,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
+@@ -1495,7 +1506,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
   }
   switch (auto_response_for_test_) {
     case ACCEPT_ONCE:
 -      AcceptThisTime();
-+      AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
+      AcceptThisTime(content_settings::LifetimeMode::OnlyThisTime);
       break;
     case ACCEPT_ALL:
       Accept();
@@ -1331,25 +1318,25 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
   GURL GetEmbeddingOrigin() const override;
   void Accept() override;
 -  void AcceptThisTime() override;
-+  void AcceptThisTime(content_settings::mojom::LifetimeMode lifetime_option) override;
+  void AcceptThisTime(content_settings::LifetimeMode lifetime_option) override;
   void Deny() override;
-+  void Deny_(bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option);
-+  void DenyThisTime(content_settings::mojom::LifetimeMode lifetime_option) override;
+  void Deny_(bool is_one_time, content_settings::LifetimeMode lifetime_option);
+  void DenyThisTime(content_settings::LifetimeMode lifetime_option) override;
   void Dismiss() override;
   void Ignore() override;
   void FinalizeCurrentRequests() override;
-@@ -372,9 +374,12 @@ class PermissionRequestManager
+@@ -368,9 +370,12 @@ class PermissionRequestManager
 
   // Calls PermissionGranted on a request and all its duplicates.
   void PermissionGrantedIncludingDuplicates(PermissionRequest* request,
 -                                            bool is_one_time);
 +                                            bool is_one_time,
-+                                            content_settings::mojom::LifetimeMode lifetime_option);
+                                            content_settings::LifetimeMode lifetime_option);
   // Calls PermissionDenied on a request and all its duplicates.
 -  void PermissionDeniedIncludingDuplicates(PermissionRequest* request);
 +  void PermissionDeniedIncludingDuplicates(PermissionRequest* request,
 +                                           bool is_one_time,
-+                                           content_settings::mojom::LifetimeMode lifetime_option);
+                                           content_settings::LifetimeMode lifetime_option);
   // Calls Cancelled on a request and all its duplicates.
   void CancelledIncludingDuplicates(PermissionRequest* request,
                                     bool is_final_decision = true);
@@ -7,7 +7,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/android/java/res/menu/main_menu.xml    |  7 ++
 .../chrome/browser/ChromeTabbedActivity.java  | 24 +++++++
 .../browser/bookmarks/BookmarkBridge.java     | 67 +++++++++++++++++++
- .../bookmarks/android/bookmark_bridge.cc      | 44 +++++++++++-
+ .../bookmarks/android/bookmark_bridge.cc      | 44 ++++++++++++
 .../bookmarks/android/bookmark_bridge.h       |  8 +++
 .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
 .../dialogs/DownloadLocationCustomView.java   |  4 +-
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/bookmark_bar_strings.grdp          |  6 ++
 .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
 components/bookmarks/browser/bookmark_codec.h |  7 +-
- .../browser/bookmark_load_details.cc          | 14 +++-
+ .../browser/bookmark_load_details.cc          |  8 ++-
 .../bookmarks/browser/bookmark_load_details.h |  2 +
 .../bookmarks/browser/bookmark_model.cc       |  3 +-
 components/bookmarks/browser/bookmark_model.h |  7 ++
@@ -26,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/bookmarks/browser/bookmark_uuids.h |  1 +
 components/bookmarks/browser/model_loader.cc  |  8 ++-
 .../bookmark_specifics_conversions.cc         |  1 +
- 22 files changed, 241 insertions(+), 15 deletions(-)
+ 22 files changed, 236 insertions(+), 14 deletions(-)

 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
         <item android:id="@+id/recent_tabs_menu_id"
             android:title="@string/menu_recent_tabs"
             android:icon="@drawable/devices_black_24dp" />
-@@ -180,6 +184,9 @@ found in the LICENSE file.
+@@ -186,6 +190,9 @@ found in the LICENSE file.
         <item android:id="@+id/close_all_incognito_tabs_menu_id"
             android:title="@string/menu_close_all_incognito_tabs"
             android:icon="@drawable/btn_close_white" />
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -91,6 +91,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
+@@ -89,6 +89,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
 import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -63,16 +63,16 @@ 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;
-@@ -2985,6 +2986,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2950,6 +2951,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                     getTabModelSelectorSupplier().get(),
-                     this::closeAllTabsHidingTabGroups);
+                     () -> getTabModelSelector().closeAllTabs());
             RecordUserAction.record("MobileMenuCloseAllTabs");
 +        } else if (id == R.id.bookmark_all_tabs_menu_id) {
 +            bookmarkAllTabs();
         } else if (id == R.id.close_all_incognito_tabs_menu_id) {
             // Close only incognito tabs
             CloseAllTabsDialog.show(
-@@ -3056,6 +3059,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3021,6 +3024,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
     }
 
@@ -103,9 +103,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -18,11 +18,17 @@ import org.jni_zero.JniType;
- import org.jni_zero.NativeMethods;
+@@ -18,11 +18,17 @@ import org.jni_zero.NativeMethods;
 
+ import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
 +import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
@@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     private long mNativeBookmarkBridge;
     private boolean mIsDestroyed;
     private boolean mIsDoingExtensiveChanges;
-@@ -395,6 +403,16 @@ class BookmarkBridge {
+@@ -402,6 +410,16 @@ class BookmarkBridge {
         return mMobileFolderId;
     }
 
@@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /** Returns Id representing the special "other" folder from bookmark model. */
     public BookmarkId getOtherFolderId() {
         ThreadUtils.assertOnUiThread();
-@@ -1083,6 +1101,50 @@ class BookmarkBridge {
+@@ -1092,6 +1110,50 @@ class BookmarkBridge {
                 .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
     }
 
@@ -198,9 +198,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /**
      * Helper method to mark an item as read.
      *
-@@ -1331,6 +1393,9 @@ class BookmarkBridge {
-         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
-                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
+@@ -1334,6 +1396,9 @@ class BookmarkBridge {
+ 
+         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(long nativeBookmarkBridge, GURL url);
 
 +        BookmarkId getBookmarkIdForTabsCollection(
 +                long nativeBookmarkBridge, GURL url);
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
 
         void getTopLevelFolderIds(
-@@ -1352,6 +1417,8 @@ class BookmarkBridge {
+@@ -1353,6 +1418,8 @@ class BookmarkBridge {
 
         BookmarkId getRootFolderId(long nativeBookmarkBridge);
 
@@ -220,17 +220,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -178,7 +178,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
- 
-     JNIEnv* env = AttachCurrentThread();
-     Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
-                                          ConvertUTF8ToJavaString(env, export_path_),
-+                                          base::android::ConvertUTF8ToJavaString(env, export_path_),
-                                           result == Result::kSuccess);
-     delete this;
-   }
-@@ -349,6 +349,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
-   return bookmark_model_->account_mobile_node() != nullptr;
+@@ -367,6 +367,33 @@ void BookmarkBridge::GetImageUrlForBookmark(
+       base::BindOnce(&HandleImageUrlResponse, callback));
 }
 
 +base::android::ScopedJavaLocalRef<jobject>
@@ -239,7 +230,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    const JavaParamRef<jobject>& url) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  GURL gurl = url::GURLAndroid::ToNativeGURL(env, url);
+  GURL gurl = *url::GURLAndroid::ToNativeGURL(env, url);
 +
 +  bookmarks::BookmarkModel* model =
 +      BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -261,9 +252,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +}
 +
 base::android::ScopedJavaLocalRef<jobject>
- BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
-                                                          const GURL& url) {
-@@ -461,6 +488,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+ BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(
+     JNIEnv* env,
+@@ -482,6 +509,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(),
@@ -271,17 +262,19 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
       bookmark_model_->bookmark_bar_node(),
       bookmark_model_->other_node(),
   };
-@@ -554,6 +582,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
-     top_level_folders.push_back(other_node);
+@@ -539,6 +567,11 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+     top_level_folders.push_back(root_child.get());
   }
 
-+  const BookmarkNode* tabs_collection_node = bookmark_model_->tabs_collection_node();
-+  top_level_folders.push_back(tabs_collection_node);
+  for (const auto& node : bookmark_model_->tabs_collection_node()->children()) {
+    if (node->is_folder())
+      top_level_folders.push_back(node.get());
+  }
 +
-   const BookmarkNode* reading_list_node =
-       local_or_syncable_reading_list_manager_->GetRoot();
-   if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
-@@ -1266,6 +1297,17 @@ void BookmarkBridge::GetBookmarksOfType(
+   if (account_reading_list_manager_ &&
+       account_reading_list_manager_->GetRoot()) {
+     top_level_folders.push_back(account_reading_list_manager_->GetRoot());
+@@ -1176,6 +1209,17 @@ void BookmarkBridge::GetBookmarksOfType(
   AddBookmarkNodesToBookmarkIdList(env, j_list, results);
 }
 
@@ -302,18 +295,18 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 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
-@@ -79,6 +79,10 @@ class BookmarkBridge : public ProfileObserver,
- 
-   jboolean AreAccountBookmarkFoldersActive(JNIEnv* env);
+@@ -77,6 +77,10 @@ class BookmarkBridge : public ProfileObserver,
+       const base::android::JavaParamRef<jobject>& j_url,
+       const base::android::JavaParamRef<jobject>& j_callback);
 
 +  base::android::ScopedJavaLocalRef<jobject> GetBookmarkIdForTabsCollection(
 +      JNIEnv* env,
 +      const base::android::JavaParamRef<jobject>& url);
 +
   base::android::ScopedJavaLocalRef<jobject>
-   GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url);
-   const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl(
-@@ -223,6 +227,10 @@ class BookmarkBridge : public ProfileObserver,
+   GetMostRecentlyAddedUserBookmarkIdForUrl(
+       JNIEnv* env,
+@@ -227,6 +231,10 @@ class BookmarkBridge : public ProfileObserver,
                           const base::android::JavaParamRef<jobject>& j_list,
                           jint type);
 
@@ -391,7 +384,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
-@@ -4196,6 +4196,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3875,6 +3875,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
       <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
         Select tabs
       </message>
@@ -427,7 +420,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
 diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
 --- a/components/bookmarks/browser/bookmark_codec.cc
 +++ b/components/bookmarks/browser/bookmark_codec.cc
-@@ -36,6 +36,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
+@@ -35,6 +35,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
 const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
 // The value is left as 'synced' for historical reasons.
 const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
@@ -435,7 +428,7 @@ 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::kIdKey[] = "id";
-@@ -73,6 +74,7 @@ base::Value::Dict BookmarkCodec::Encode(
+@@ -72,6 +73,7 @@ base::Value::Dict BookmarkCodec::Encode(
     const BookmarkNode* bookmark_bar_node,
     const BookmarkNode* other_folder_node,
     const BookmarkNode* mobile_folder_node,
@@ -443,16 +436,16 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
     std::string sync_metadata_str) {
   ids_reassigned_ = false;
   uuids_reassigned_ = false;
-@@ -98,6 +100,8 @@ base::Value::Dict BookmarkCodec::Encode(
-     roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
-     roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
-     roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
-+    if (tabs_folder_node)
-+      roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
-   } else {
-     // No permanent node should have been provided.
-     CHECK(!other_folder_node);
-@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -91,6 +93,8 @@ base::Value::Dict BookmarkCodec::Encode(
+   roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
+   roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
+   roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
+  if (tabs_folder_node)
+    roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
+ 
+   FinalizeChecksum();
+   // We are going to store the computed checksum. So set stored checksum to be
+@@ -107,6 +111,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
                            BookmarkNode* bb_node,
                            BookmarkNode* other_folder_node,
                            BookmarkNode* mobile_folder_node,
@@ -460,7 +453,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                            int64_t* max_id,
                            std::string* sync_metadata_str) {
   const int64_t max_already_assigned_id =
-@@ -133,7 +138,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -117,7 +122,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
             base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
             base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
             base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -470,7 +463,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
   ids_reassigned_ = false;
   uuids_reassigned_ = false;
   ids_valid_ = true;
-@@ -141,13 +147,14 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -125,13 +131,14 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
   stored_checksum_.clear();
   InitializeChecksum();
   bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
@@ -486,7 +479,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
   }
   *max_id = maximum_id_ + 1;
   return success;
-@@ -205,6 +212,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
+@@ -189,6 +196,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
 bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                  BookmarkNode* other_folder_node,
                                  BookmarkNode* mobile_folder_node,
@@ -494,7 +487,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                                  const base::Value::Dict& value,
                                  std::string* sync_metadata_str) {
   std::optional<int> version = value.FindInt(kVersionKey);
-@@ -237,6 +245,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -213,6 +221,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
       roots->FindDict(kOtherBookmarkFolderNameKey);
   const base::Value::Dict* mobile_folder_value =
       roots->FindDict(kMobileBookmarkFolderNameKey);
@@ -503,16 +496,16 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 
   if (!bb_value || !other_folder_value || !mobile_folder_value)
     return false;
-@@ -244,6 +254,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -220,6 +230,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);
 +  if (tabs_folder_value)
 +    DecodeNode(*tabs_folder_value, nullptr, tabs_folder_node);
 
-   // Need to reset the title as the title is persisted and restored from
-   // the file.
-@@ -477,12 +489,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+   if (sync_metadata_str) {
+     const std::string* sync_metadata_str_base64 =
+@@ -459,11 +471,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
 
 void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                 BookmarkNode* other_node,
@@ -520,7 +513,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 +                                BookmarkNode* mobile_node,
 +                                BookmarkNode* tabs_folder_node) {
   ids_.clear();
-   reassigned_ids_per_old_id_.clear();
   ReassignIDsHelper(bb_node);
   ReassignIDsHelper(other_node);
   ReassignIDsHelper(mobile_node);
@@ -531,7 +523,7 @@ 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
-@@ -43,6 +43,7 @@ class BookmarkCodec {
+@@ -39,6 +39,7 @@ class BookmarkCodec {
       const BookmarkNode* bookmark_bar_node,
       const BookmarkNode* other_folder_node,
       const BookmarkNode* mobile_folder_node,
@@ -539,7 +531,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
       std::string sync_metadata_str);
 
   // Decodes the previously encoded value to the specified nodes as well as
-@@ -61,6 +62,7 @@ class BookmarkCodec {
+@@ -57,6 +58,7 @@ class BookmarkCodec {
               BookmarkNode* bb_node,
               BookmarkNode* other_folder_node,
               BookmarkNode* mobile_folder_node,
@@ -547,7 +539,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
               int64_t* max_node_id,
               std::string* sync_metadata_str);
 
-@@ -92,6 +94,7 @@ class BookmarkCodec {
+@@ -82,6 +84,7 @@ class BookmarkCodec {
   static const char kBookmarkBarFolderNameKey[];
   static const char kOtherBookmarkFolderNameKey[];
   static const char kMobileBookmarkFolderNameKey[];
@@ -555,7 +547,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
   static const char kVersionKey[];
   static const char kChecksumKey[];
   static const char kIdKey[];
-@@ -124,6 +127,7 @@ class BookmarkCodec {
+@@ -114,6 +117,7 @@ class BookmarkCodec {
   bool DecodeHelper(BookmarkNode* bb_node,
                     BookmarkNode* other_folder_node,
                     BookmarkNode* mobile_folder_node,
@@ -563,7 +555,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                     const base::Value::Dict& value,
                     std::string* sync_metadata_str);
 
-@@ -134,7 +138,8 @@ class BookmarkCodec {
+@@ -124,7 +128,8 @@ class BookmarkCodec {
   // Reassigns bookmark IDs for all nodes.
   void ReassignIDs(BookmarkNode* bb_node,
                    BookmarkNode* other_node,
@@ -594,26 +586,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
 
   CHECK_EQ(kNumDefaultTopLevelPermanentFolders, root_node_->children().size());
 }
-@@ -86,6 +88,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
-   if (mobile_folder_node_->id() == 0) {
-     mobile_folder_node_->set_id(max_id_++);
-   }
-+
-+  if (tabs_collection_folder_node_->id() == 0) {
-+    tabs_collection_folder_node_->set_id(max_id_++);
-+  }
- }
- 
- void BookmarkLoadDetails::AddManagedNode(
-@@ -98,6 +104,7 @@ void BookmarkLoadDetails::AddManagedNode(
-   CHECK_NE(bb_node_->id(), 0);
-   CHECK_NE(other_folder_node_->id(), 0);
-   CHECK_NE(mobile_folder_node_->id(), 0);
-+  CHECK_NE(tabs_collection_folder_node_->id(), 0);
- 
-   has_managed_node_ = true;
-   root_node_->Add(std::move(managed_node));
-@@ -105,8 +112,8 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -105,8 +107,8 @@ void BookmarkLoadDetails::AddManagedNode(
 
 void BookmarkLoadDetails::CreateIndices() {
   local_or_syncable_uuid_index_.insert(root_node_.get());
@@ -624,18 +597,10 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
   for (const auto& child : root_node_->children()) {
     if (child.get() == account_bb_node_ ||
         child.get() == account_other_folder_node_ ||
-@@ -125,6 +132,7 @@ void BookmarkLoadDetails::ResetPermanentNodePointers() {
-   bb_node_ = nullptr;
-   other_folder_node_ = nullptr;
-   mobile_folder_node_ = nullptr;
-+  tabs_collection_folder_node_ = nullptr;
-   account_bb_node_ = nullptr;
-   account_other_folder_node_ = nullptr;
-   account_mobile_folder_node_ = nullptr;
 diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h
 --- a/components/bookmarks/browser/bookmark_load_details.h
 +++ b/components/bookmarks/browser/bookmark_load_details.h
-@@ -40,6 +40,7 @@ class BookmarkLoadDetails {
+@@ -39,6 +39,7 @@ class BookmarkLoadDetails {
   BookmarkPermanentNode* bb_node() { return bb_node_; }
   BookmarkPermanentNode* mobile_folder_node() { return mobile_folder_node_; }
   BookmarkPermanentNode* other_folder_node() { return other_folder_node_; }
@@ -643,7 +608,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 
   // Account permanent nodes (null unless `AddAccountPermanentNodes()` is
   // called).
-@@ -151,6 +152,7 @@ class BookmarkLoadDetails {
+@@ -138,6 +139,7 @@ class BookmarkLoadDetails {
   raw_ptr<BookmarkPermanentNode> bb_node_;
   raw_ptr<BookmarkPermanentNode> other_folder_node_;
   raw_ptr<BookmarkPermanentNode> mobile_folder_node_;
@@ -654,7 +619,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
-@@ -914,7 +914,7 @@ bool BookmarkModel::HasBookmarks() const {
+@@ -846,7 +846,7 @@ bool BookmarkModel::HasBookmarks() const {
 bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return bookmark_bar_node_->children().empty() &&
@@ -663,7 +628,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 }
 
 bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1246,6 +1246,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1191,6 +1191,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();
@@ -674,7 +639,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -157,6 +157,12 @@ class BookmarkModel : public CoreBookmarkModel,
+@@ -159,6 +159,12 @@ class BookmarkModel final : public BookmarkUndoProvider,
   // bookmarks in the account storage).
   const BookmarkNode* account_mobile_node() const;
 
@@ -687,7 +652,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
   bool is_root_node(const BookmarkNode* node) const {
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     return node == root_;
-@@ -639,6 +645,7 @@ class BookmarkModel : public CoreBookmarkModel,
+@@ -619,6 +625,7 @@ class BookmarkModel final : public BookmarkUndoProvider,
   raw_ptr<BookmarkPermanentNode> account_bookmark_bar_node_ = nullptr;
   raw_ptr<BookmarkPermanentNode> account_other_node_ = nullptr;
   raw_ptr<BookmarkPermanentNode> account_mobile_node_ = nullptr;
@@ -734,7 +699,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
     MOBILE
   };
 
-@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -231,6 +232,8 @@ class BookmarkPermanentNode : public BookmarkNode {
       int64_t id);
   static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
       int64_t id);
@@ -753,8 +718,8 @@ diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookm
 +          model->tabs_collection_node(),
           model->client()->EncodeLocalOrSyncableBookmarkSyncMetadata());
     case BookmarkStorage::kSelectAccountNodes:
-       // Either all permanent folders or none should exist.
-@@ -61,6 +62,7 @@ base::Value::Dict EncodeModelToDict(
+       if (!model->account_bookmark_bar_node()) {
+@@ -59,6 +60,7 @@ base::Value::Dict EncodeModelToDict(
       return codec.Encode(model->account_bookmark_bar_node(),
                           model->account_other_node(),
                           model->account_mobile_node(),
@@ -808,7 +773,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
                      &sync_metadata_str)) {
       ids_assigned_to_account_nodes = codec.release_assigned_ids();
 
-@@ -127,7 +130,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -110,7 +113,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(),
@@ -821,7 +786,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
 --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
 +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
-@@ -444,6 +444,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+@@ -445,6 +445,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
     case bookmarks::BookmarkNode::BOOKMARK_BAR:
     case bookmarks::BookmarkNode::OTHER_NODE:
     case bookmarks::BookmarkNode::MOBILE:
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -107,6 +107,9 @@ found in the LICENSE file.
+@@ -113,6 +113,9 @@ found in the LICENSE file.
         <item android:id="@+id/add_to_homescreen_id"
             android:title="@string/menu_add_to_homescreen"
             android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -3011,6 +3011,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2976,6 +2976,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2748,6 +2748,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2729,6 +2729,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             return doOpenWebApk(currentTab);
         }
 
@@ -69,16 +69,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -576,6 +576,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
+@@ -585,6 +585,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                         isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
 
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
 +        updateViewSourceMenuItem(menu, currentTab);
 
-         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
+         updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
 
-@@ -1304,6 +1305,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         findInPageMenuRow.setVisible(itemVisible);
+@@ -1236,6 +1237,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         }
     }
 
 +    /**
@@ -104,10 +104,10 @@ 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
-@@ -294,6 +294,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -295,6 +295,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
 
             updateRequestDesktopSiteMenuItem(
-                     menu, currentTab, requestDesktopSiteVisible, isNativePage);
+                     menu, currentTab, requestDesktopSiteVisible, isChromeScheme);
 +            updateViewSourceMenuItem(menu, currentTab);
             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
         }
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 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
-@@ -311,6 +311,10 @@ CHAR_LIMIT guidelines:
+@@ -317,6 +317,10 @@ CHAR_LIMIT guidelines:
         USB
       </message>
 
@@ -8,15 +8,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../tasks/tab_management/TabProperties.java   |  5 +++
 .../java/res/xml/privacy_preferences.xml      |  5 +++
 .../chrome/browser/app/ChromeActivity.java    |  3 +-
- .../privacy/settings/PrivacySettings.java     | 43 ++++++++++++++++++-
- .../browser/tab_ui/TabContentManager.java     |  6 ++-
+ .../layouts/content/TabContentManager.java    |  7 +++-
+ .../privacy/settings/PrivacySettings.java     | 42 ++++++++++++++++++-
 .../strings/android_chrome_strings.grd        |  8 ++++
 7 files changed, 73 insertions(+), 7 deletions(-)

 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -350,9 +350,12 @@ class TabGridViewBinder {
+@@ -327,9 +327,12 @@ class TabGridViewBinder {
                         // Adjust bitmap to thumbnail.
                         TabUtils.setBitmapAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                     } else if (isMostRecentRequest) {
@@ -32,7 +32,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                     }
                 };
         if (sThumbnailFetcherForTesting != null) {
-@@ -391,6 +394,7 @@ class TabGridViewBinder {
+@@ -368,6 +371,7 @@ class TabGridViewBinder {
             ViewLookupCachingFrameLayout rootView,
             PropertyModel model,
             TabListFaviconProvider.TabFavicon favicon) {
@@ -43,7 +43,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
-@@ -74,6 +74,9 @@ public class TabProperties {
+@@ -63,6 +63,9 @@ public class TabProperties {
     public static final WritableBooleanPropertyKey FAVICON_FETCHED =
             new WritableBooleanPropertyKey();
 
@@ -53,16 +53,16 @@ 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<>();
-@@ -175,6 +178,7 @@ public class TabProperties {
+@@ -160,6 +163,7 @@ public class TabProperties {
                 CARD_TYPE,
                 CONTENT_DESCRIPTION_STRING,
-                 ACTION_BUTTON_DESCRIPTION_STRING,
+                 CLOSE_BUTTON_DESCRIPTION_STRING,
 +                FAVICON,
                 SHOPPING_PERSISTED_TAB_DATA_FETCHER,
                 SHOULD_SHOW_PRICE_DROP_TOOLTIP,
-                 QUICK_DELETE_ANIMATION_STATUS,
-@@ -190,6 +194,7 @@ public class TabProperties {
-                 TAB_ACTION_BUTTON_LISTENER,
+                 QUICK_DELETE_ANIMATION_STATUS
+@@ -172,6 +176,7 @@ public class TabProperties {
+                 TAB_CLOSED_LISTENER,
                 FAVICON_FETCHED,
                 FAVICON_FETCHER,
 +                FAVICON,
@@ -72,7 +72,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -70,6 +70,11 @@ found in the LICENSE file.
+@@ -54,6 +54,11 @@ found in the LICENSE file.
         android:title="@string/open_external_links_incognito_title"
         android:summary="@string/open_external_links_incognito_summary"
         android:defaultValue="false" />
@@ -87,15 +87,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/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
-@@ -144,6 +144,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+@@ -145,6 +145,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.printing.TabPrinter;
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
 import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.profiles.ProfileProvider;
 import org.chromium.chrome.browser.readaloud.ReadAloudController;
-@@ -721,7 +722,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ import org.chromium.chrome.browser.selection.SelectionPopupBackPressHandler;
+@@ -704,7 +705,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                     new TabContentManager(
                             this,
                             mBrowserControlsManagerSupplier.get(),
@@ -104,10 +104,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
                             tabModelSelector != null ? tabModelSelector::getTabById : null));
 
             getBrowserControlsManager()
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
+@@ -326,11 +326,14 @@ public class TabContentManager {
+      */
+     public void getTabThumbnailWithCallback(
+             @NonNull int tabId,
+-            @NonNull Size thumbnailSize,
+            @NonNull Size thumbnailSize, //
+             @NonNull Callback<Bitmap> callback,
+             boolean forceUpdate,
+             boolean writeBack) {
+-        if (!mSnapshotsEnabled) return;
+        if (!mSnapshotsEnabled) {
+            callback.onResult(null);
+            return;
+        }
+ 
+         // TODO(crbug/1444782): Remove forceUpdate and writeBack params once the following features
+         // launch:
 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
-@@ -64,12 +64,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -66,12 +66,25 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
@@ -121,9 +141,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
 /** Fragment to keep track of the all the privacy related preferences. */
 public class PrivacySettings extends ChromeBaseSettingsFragment
-        implements Preference.OnPreferenceChangeListener, FragmentSettingsLauncher {
-+        implements Preference.OnPreferenceChangeListener, FragmentSettingsLauncher, INeedSnackbarManager {
-+
+-        implements Preference.OnPreferenceChangeListener {
+        implements Preference.OnPreferenceChangeListener, INeedSnackbarManager {
 +    private SnackbarManager mSnackbarManager;
 +    private Snackbar mSnackbar;
 +
@@ -135,7 +154,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";
-@@ -157,6 +171,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -140,6 +153,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             }
         }
 
@@ -157,7 +176,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(
-@@ -366,6 +395,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -321,6 +349,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";
@@ -165,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -391,6 +421,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -346,6 +375,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
             sharedPreferencesEditor.apply();
@@ -179,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -447,6 +484,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -386,6 +422,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             : R.string.text_off);
         }
 
@@ -190,26 +209,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference refererPolicyPref = findPreference(PREF_REFERER_POLICY);
         refererPolicyPref.setSummary(
                 RefererSettingsFragment.getRefererSummaryString(getContext()));
-diff --git a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java b/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
--- a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
-+++ b/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
-@@ -328,8 +328,10 @@ public class TabContentManager {
-             @NonNull Callback<Bitmap> callback,
-             boolean forceUpdate,
-             boolean writeBack) {
-        if (!mSnapshotsEnabled) return;
-
-+        if (!mSnapshotsEnabled) {
-+            callback.onResult(null);
-+            return;
-+        }
-         // TODO(crbug.com/40267864): Remove forceUpdate and writeBack params once the following
-         // features
-         // launch:
 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
-@@ -5664,6 +5664,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -5371,6 +5371,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
         Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
       </message>
 
@@ -1,206 +1,30 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Sun, 5 May 2024 09:34:39 +0000
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Mon, 1 Feb 2021 19:18:55 +0200
 Subject: Add option to force tablet UI

-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
 ---
- .../start_surface/StartSurfaceMediator.java   |  5 +++-
- .../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 +++-
- .../chrome/browser/ChromeTabbedActivity.java  |  4 ++-
- .../chrome/browser/WarmupManager.java         |  5 +++-
- .../settings/AccessibilitySettings.java       | 13 +++++++++
- .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++
- .../chrome/browser/app/ChromeActivity.java    |  4 ++-
- .../overlays/strip/StripLayoutHelper.java     | 10 +++++--
- .../strip/StripLayoutHelperManager.java       |  7 ++++-
- .../chrome/browser/ui/RootUiCoordinator.java  |  5 +++-
+ .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++++++
+ .../browser/tasks/ReturnToChromeUtil.java     |  4 +++-
+ .../chrome/browser/ui/RootUiCoordinator.java  |  5 ++++-
 chrome/browser/preferences/BUILD.gn           |  1 +
 .../preferences/ChromePreferenceKeys.java     |  1 +
- .../preferences/ChromeSharedPreferences.java  |  8 ++++++
+ .../preferences/ChromeSharedPreferences.java  |  8 ++++++++
 .../LegacyChromePreferenceKeys.java           |  1 +
- .../SingleTabSwitcherOnNtpMediator.java       |  1 +
 .../omnibox/LocationBarCoordinator.java       |  2 +-
- .../strings/android_chrome_strings.grd        |  7 +++++
- .../java/res/layout/control_container.xml     | 12 ++++----
- .../java/res/layout/toolbar_tablet.xml        |  2 +-
- .../java/res/values-sw600dp/dimens.xml        |  5 ++--
- .../toolbar/java/res/values/dimens.xml        |  5 ++--
- .../browser/toolbar/ControlContainer.java     |  2 +-
- .../top/TabStripTransitionCoordinator.java    |  2 +-
- .../toolbar/top/ToolbarControlContainer.java  | 28 ++++++++++++++++++-
- .../browser/toolbar/top/ToolbarLayout.java    |  5 +++-
- components/BUILD.gn                           |  6 ++--
- .../res/xml/accessibility_preferences.xml     |  5 ++++
- .../AccessibilitySettingsDelegate.java        | 11 ++++++++
- .../chromium/ui/base/DeviceFormFactor.java    |  9 ++++++
- 32 files changed, 167 insertions(+), 32 deletions(-)
+ .../strings/android_chrome_strings.grd        |  7 +++++++
+ components/BUILD.gn                           |  6 +++---
+ .../res/xml/accessibility_preferences.xml     |  5 +++++
+ .../accessibility/AccessibilitySettings.java  | 10 ++++++++++
+ .../AccessibilitySettingsDelegate.java        |  2 ++
+ .../chromium/ui/base/DeviceFormFactor.java    |  6 ++++++
+ 14 files changed, 71 insertions(+), 6 deletions(-)

-diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -97,6 +97,7 @@ import org.chromium.components.browser_ui.widget.gesture.BackPressHandler;
- import org.chromium.components.embedder_support.util.UrlUtilities;
- import org.chromium.components.prefs.PrefService;
- import org.chromium.content_public.browser.LoadUrlParams;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.ui.text.EmptyTextWatcher;
- import org.chromium.ui.util.ColorUtils;
-@@ -1124,7 +1125,9 @@ class StartSurfaceMediator
-     int getTopToolbarPlaceholderHeight() {
-         // If logo is visible in Start surface instead of in the toolbar, we don't need to show the
-         // top margin of the fake search box.
-        return getPixelSize(R.dimen.control_container_height)
-+        return DeviceFormFactor.isForceTabletUI()
-+                    ? getPixelSize(R.dimen.control_container_height_tabletui)
-+                    : getPixelSize(R.dimen.control_container_height_cromite)
-                 + (isLogoVisible()
-                         ? 0
-                         : getPixelSize(R.dimen.start_surface_fake_search_box_top_margin));
-diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
--- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
-+++ b/chrome/android/java/res/layout/custom_tabs_control_container.xml
-@@ -32,7 +32,7 @@ found in the LICENSE file.
-             android:id="@+id/find_toolbar_stub"
-             android:inflatedId="@+id/find_toolbar"
-             android:visibility="gone"
-            android:layout_marginTop="@dimen/tab_strip_height"
-+            android:layout_marginTop="@dimen/tab_strip_height_cromite"
-             android:layout_width="match_parent"
-             android:layout_height="@dimen/custom_tabs_control_container_height"
-             android:layout="@layout/find_toolbar" />
-diff --git a/chrome/android/java/res/layout/recent_tabs_page.xml b/chrome/android/java/res/layout/recent_tabs_page.xml
--- a/chrome/android/java/res/layout/recent_tabs_page.xml
-+++ b/chrome/android/java/res/layout/recent_tabs_page.xml
-@@ -11,7 +11,7 @@ found in the LICENSE file.
-     android:id="@+id/history_navigation"
-     android:layout_width="match_parent"
-     android:layout_height="match_parent"
-    android:paddingTop="@dimen/tab_strip_height" >
-+    android:paddingTop="@dimen/tab_strip_height_cromite" >
- 
-     <org.chromium.chrome.browser.ntp.NativePageRootFrameLayout
-         android:id="@+id/recent_tabs_root"
-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.
-     <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>
- 
-     <!-- NTP dimensions -->
-     <dimen name="ntp_search_box_transition_length">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
-@@ -120,9 +120,13 @@ found in the LICENSE file.
-     <dimen name="tab_modal_scrim_vertical_margin">16dp</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="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">60dp</dimen>
-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
-@@ -2280,7 +2280,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
- 
-     @Override
-     public int getControlContainerHeightResource() {
-        return R.dimen.control_container_height;
-+        if (DeviceFormFactor.isForceTabletUI())
-+            return R.dimen.control_container_height_tabletui;
-+        return R.dimen.control_container_height_cromite;
-     }
- 
-     @Override
-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
-@@ -56,6 +56,7 @@ import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.content_public.browser.WebContents;
- import org.chromium.content_public.browser.WebContentsObserver;
- import org.chromium.ui.LayoutInflaterUtils;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.display.DisplayUtil;
- 
-@@ -425,7 +426,9 @@ public class WarmupManager {
-                     (ControlContainer) mainView.findViewById(R.id.control_container);
- 
-             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
-                controlContainer.initWithToolbar(toolbarId);
-+                controlContainer.initWithToolbar(toolbarId,
-+                        DeviceFormFactor.isForceTabletUI()
-+                            ? R.dimen.control_container_height_tabletui : 0);
-             }
-             return mainView;
-         } catch (InflateException e) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsControlle
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
-+import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
- import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
-@@ -46,6 +47,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     public static final String PREF_ZOOM_INFO = "zoom_info";
-     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
- 
-+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
-+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
-+
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -143,6 +147,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-                 mPrefService.getBoolean(Pref.READER_FOR_ACCESSIBILITY));
-         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
- 
-+        ChromeSwitchPreference forceTabletUiPref =
-+                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
-+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
-+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
-+        forceTabletUiPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -214,6 +224,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
-         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
-             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
-+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
-+            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
-+            mDelegate.requestRestart(getActivity());
-         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
-             mPrefService.setBoolean(Pref.READER_FOR_ACCESSIBILITY, (Boolean) newValue);
-         } else if (PREF_PAGE_ZOOM_DEFAULT_ZOOM.equals(preference.getKey())) {
 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
-@@ -38,6 +38,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
-         }
+@@ -94,6 +94,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+         return new TextSizeContrastAccessibilityDelegate(getBrowserContextHandle());
     }
 
 +    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
@@ -222,90 +46,35 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +        return new ForceTabletUIDelegate();
 +    }
 +
-     private final Profile mProfile;
- 
-     /**
-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
-@@ -862,7 +862,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             // Inflate the correct toolbar layout for the device.
-             int toolbarLayoutId = getToolbarLayoutId();
-             if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
-                controlContainer.initWithToolbar(toolbarLayoutId);
-+                controlContainer.initWithToolbar(toolbarLayoutId,
-+                        DeviceFormFactor.isForceTabletUI()
-+                            ? R.dimen.control_container_height_tabletui : 0);
-             }
-             onInitialLayoutInflationComplete();
-         }
-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
-@@ -84,6 +84,7 @@ import org.chromium.components.feature_engagement.Tracker;
- import org.chromium.components.prefs.PrefService;
- import org.chromium.components.tab_groups.TabGroupColorId;
- import org.chromium.components.user_prefs.UserPrefs;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.base.LocalizationUtils;
- import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.interpolators.Interpolators;
-@@ -5059,8 +5060,13 @@ public class StripLayoutHelper implements StripLayoutTabDelegate, StripLayoutGro
-         mTabMenu.setAnchorView(tabView);
-         // 3. Set the vertical offset to align the tab 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);
-         mTabMenu.setVerticalOffset(verticalOffset);
- 
-         // 4. Set the horizontal offset to align the tab menu with the right side of the tab
-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
-@@ -80,6 +80,7 @@ import org.chromium.chrome.browser.ui.system.StatusBarColorController;
- import org.chromium.components.browser_ui.styles.SemanticColorUtils;
- import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
- import org.chromium.content_public.browser.LoadUrlParams;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.base.LocalizationUtils;
- import org.chromium.ui.base.PageTransition;
- import org.chromium.ui.base.WindowAndroid;
-@@ -405,11 +406,15 @@ public class StripLayoutHelperManager
- 
-         mIsLayoutOptimizationsEnabled =
-                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
-        mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
-+        mScrollableStripHeight =
-+            (DeviceFormFactor.isForceTabletUI()
-+                ? res.getDimension(R.dimen.tab_strip_height_tabletui)
-+                : res.getDimension(R.dimen.tab_strip_height_cromite)) / mDensity;
-         mHeight =
-                 mIsLayoutOptimizationsEnabled
-                         ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
-                         : mScrollableStripHeight;
-+
-         mTopPadding = mHeight - mScrollableStripHeight;
-         mDesktopWindowStateProvider = desktopWindowStateProvider;
+     @Override
+     public void addExtraPreferences(PreferenceFragmentCompat fragment) {
+         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
+@@ -979,7 +979,9 @@ public final class ReturnToChromeUtil {
 
+     public static boolean isScrollableMvtEnabled(Context context) {
+         boolean isSurfacePolishEnabled = ChromeFeatureList.sSurfacePolish.isEnabled();
+-        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
+        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) ||
+             ChromeSharedPreferences.getInstance().readBoolean(
+                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) {
+             // On phones, parameter SURFACE_POLISH_SCROLLABLE_MVT is checked when feature flag
+             // surface polish is enabled; otherwise, feature flag
+             // SHOW_SCROLLABLE_MVT_ON_NTP_PHONE_ANDROID is checked.
 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
-@@ -98,6 +98,7 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
+@@ -98,6 +98,7 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
- import org.chromium.chrome.browser.pdf.PdfPage;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
 import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
 import org.chromium.chrome.browser.profiles.Profile;
-@@ -1611,7 +1612,9 @@ public class RootUiCoordinator
+ import org.chromium.chrome.browser.profiles.ProfileManager;
+@@ -1595,7 +1596,9 @@ public class RootUiCoordinator
         if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
 
         int stubId = R.id.find_toolbar_stub;
@@ -330,10 +99,10 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -265,6 +265,7 @@ public final class ChromePreferenceKeys {
-     /** Whether the app-specific history info text was already seen by users. */
-     public static final String HISTORY_APP_SPECIFIC_INFO_SEEN =
-             "Chrome.History.AppSpecificInfoSeen";
+@@ -270,6 +270,7 @@ public final class ChromePreferenceKeys {
+             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
+ 
+     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
 +    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";
 
     /** Keys used to save settings related to homepage. */
@@ -341,16 +110,16 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
-@@ -12,6 +12,8 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
+@@ -11,6 +11,8 @@ import org.chromium.base.shared_preferences.PreferenceKeyRegistry;
+ import org.chromium.base.shared_preferences.SharedPreferencesManager;
 import org.chromium.build.BuildConfig;
- import org.chromium.build.annotations.AssumeNonNull;
 
 +import org.chromium.ui.base.DeviceFormFactor;
 +
 @JNINamespace("android::shared_preferences")
 public class ChromeSharedPreferences {
     public static final PreferenceKeyRegistry REGISTRY =
-@@ -23,6 +25,12 @@ public class ChromeSharedPreferences {
+@@ -22,6 +24,12 @@ public class ChromeSharedPreferences {
                             LegacyChromePreferenceKeys.getPrefixesInUse())
                     : null);
 
@@ -366,7 +135,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys {
+@@ -58,6 +58,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
@@ -374,21 +143,10 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
-diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
--- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
-+++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
-@@ -40,6 +40,7 @@ import org.chromium.components.browser_ui.widget.displaystyle.HorizontalDisplayS
- import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
- import org.chromium.components.browser_ui.widget.displaystyle.UiConfig.DisplayStyle;
- import org.chromium.components.embedder_support.util.UrlUtilities;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.url.GURL;
- 
 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
-@@ -778,7 +778,7 @@ public class LocationBarCoordinator
+@@ -771,7 +771,7 @@ public class LocationBarCoordinator
     }
 
     private boolean isTabletWindow() {
@@ -400,8 +158,8 @@ 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
-@@ -1664,6 +1664,13 @@ Your Google account may have other forms of browsing history like searches and a
-         Hide your IP address
+@@ -1564,6 +1564,13 @@ Your Google account may have other forms of browsing history like searches and a
+         Manage third-party cookies and tracking protections
       </message>
 
 +      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
@@ -414,194 +172,6 @@ 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]">
         Safety check
-diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml b/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
--- a/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
-+++ b/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
-@@ -9,7 +9,7 @@ found in the LICENSE file.
-     android:id="@+id/control_container"
-     android:layout_width="match_parent"
-     android:layout_height="wrap_content"
-    android:minHeight="@dimen/control_container_height" >
-+    android:minHeight="@dimen/control_container_height_cromite" >
- 
-     <view
-         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
-@@ -20,7 +20,7 @@ found in the LICENSE file.
-         <ViewStub
-             android:id="@+id/toolbar_stub"
-             android:layout_width="match_parent"
-            android:layout_marginTop="@dimen/tab_strip_height"
-+            android:layout_marginTop="@dimen/tab_strip_height_cromite"
-             android:layout_height="@dimen/toolbar_height_no_shadow" />
- 
-         <ImageView
-@@ -28,7 +28,7 @@ found in the LICENSE file.
-             android:src="@drawable/toolbar_hairline"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/control_container_height"
-+            android:layout_marginTop="@dimen/control_container_height_cromite"
-             android:scaleType="fitXY"
-             android:importantForAccessibility="no" />
- 
-@@ -36,7 +36,7 @@ found in the LICENSE file.
-             android:id="@+id/find_toolbar_stub"
-             android:inflatedId="@+id/find_toolbar"
-             android:visibility="gone"
-            android:layout_marginTop="@dimen/tab_strip_height"
-+            android:layout_marginTop="@dimen/tab_strip_height_cromite"
-             android:layout_width="match_parent"
-             android:layout_height="@dimen/toolbar_height_no_shadow"
-             android:layout="@layout/find_toolbar" />
-@@ -55,14 +55,14 @@ found in the LICENSE file.
-         android:id="@+id/target_view_stub"
-         android:inflatedId="@+id/toolbar_drag_drop_target_view"
-         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/tab_strip_height"
-+        android:layout_marginTop="@dimen/tab_strip_height_cromite"
-         android:layout_height="@dimen/toolbar_height_no_shadow"
-         android:layout="@layout/drag_drop_target_view" />
- 
-     <ViewStub
-         android:id="@+id/tab_switcher_toolbar_stub"
-         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/tab_strip_height"
-+        android:layout_marginTop="@dimen/tab_strip_height_cromite"
-         android:layout_height="@dimen/toolbar_height_no_shadow"
-         android:inflatedId="@+id/tab_switcher_toolbar"
-         android:layout="@layout/tab_switcher_toolbar" />
-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.
-     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
-+++ b/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
-@@ -7,6 +7,7 @@ found in the LICENSE file.
- 
- <resources>
-     <!-- Tab Strip Dimensions -->
-    <dimen name="tab_strip_height">40dp</dimen>
-    <dimen name="tab_strip_reserved_top_padding">2dp</dimen>
-+    <dimen name="tab_strip_height_cromite">40dp</dimen>
-+    <dimen name="tab_strip_height_tabletui">40dp</dimen>
-+    <dimen name="tab_strip_reserved_top_padding_cromite">2dp</dimen>
- </resources>
-diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
--- a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
-+++ b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
-@@ -10,8 +10,9 @@ found in the LICENSE file.
-     <dimen name="toolbar_tab_count_text_size_2_digit">10dp</dimen>
- 
-     <!-- Tab Strip Dimensions -->
-    <dimen name="tab_strip_height">0dp</dimen>
-    <dimen name="tab_strip_reserved_top_padding">0dp</dimen>
-+    <dimen name="tab_strip_height_cromite">0dp</dimen>
-+    <dimen name="tab_strip_height_tabletui">40dp</dimen>
-+    <dimen name="tab_strip_reserved_top_padding_cromite">0dp</dimen>
- 
-     <!-- Negative vertical inset added to the search box bounds when modern is enabled. 4dp is added
-          to both the top and bottom bounds to bring the 48dp modern_toolbar_background_size to 56dp
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-@@ -20,7 +20,7 @@ public interface ControlContainer {
-      * Initialize the control container with the specified toolbar.
-      * @param toolbarLayoutId The ID of the toolbar layout to use.
-      */
-    void initWithToolbar(int toolbarLayoutId);
-+    void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId);
- 
-     /**
-      * @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
-@@ -155,7 +155,7 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
-         mTabStripReservedTopPadding =
-                 controlContainerView()
-                         .getResources()
-                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding);
-+                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding_cromite);
- 
-         mOnLayoutChangedListener =
-                 (view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
-@@ -5,6 +5,7 @@
- package org.chromium.chrome.browser.toolbar.top;
- 
- import android.content.Context;
-+import android.content.res.Resources;
- import android.graphics.Canvas;
- import android.graphics.PorterDuff;
- import android.graphics.Rect;
-@@ -119,8 +120,33 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
-     }
- 
-     @Override
-    public void initWithToolbar(int toolbarLayoutId) {
-+    public void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId) {
-         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
-+            if (controlContainerHeightOverrideId != 0) {
-+                Resources res = getContext().getResources();
-+                setMinimumHeight((int) res.getDimension(controlContainerHeightOverrideId));
-+                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;
-+
-+                view = findViewById(R.id.target_view_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
-+
-+                view = findViewById(R.id.tab_switcher_toolbar_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
-+            }
-             mToolbarContainer =
-                     (ToolbarViewResourceFrameLayout) findViewById(R.id.toolbar_container);
-             ViewStub toolbarStub = findViewById(R.id.toolbar_stub);
-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;
- import org.chromium.components.feature_engagement.Tracker;
- import org.chromium.ui.UiUtils;
- import org.chromium.ui.base.ViewUtils;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.util.TokenHolder;
- import org.chromium.url.GURL;
- 
-@@ -596,7 +597,9 @@ public abstract class ToolbarLayout extends FrameLayout
-      * not have a tab strip.
-      */
-     protected int getTabStripHeightFromResource() {
-        return getResources().getDimensionPixelSize(R.dimen.tab_strip_height);
-+        if (DeviceFormFactor.isForceTabletUI())
-+            return getResources().getDimensionPixelSize(R.dimen.tab_strip_height_tabletui);
-+        return getResources().getDimensionPixelSize(R.dimen.tab_strip_height_cromite);
-     }
- 
-     /** Triggered when the content view for the specified tab has changed. */
 diff --git a/components/BUILD.gn b/components/BUILD.gn
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
@@ -614,7 +184,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
   disallowed_extension_deps_ = [
     # Components should largely not depend on //extensions. Since // extensions
     # is not a component target and is linked with //chrome, depending on most
-@@ -851,7 +851,7 @@ test("components_unittests") {
+@@ -831,7 +831,7 @@ test("components_unittests") {
   # On other platforms, no components should depend on Chrome.
   # Since //chrome depends on //extensions, we also only assert_no_deps on
   # extensions targets for non-lacros builds.
@@ -623,7 +193,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
     assert_no_deps = [ "//chrome/*" ]
     assert_no_deps += disallowed_extension_deps_
   }
-@@ -1137,7 +1137,7 @@ if (use_blink) {
+@@ -1113,7 +1113,7 @@ if (use_blink) {
     # dependency. On other platforms, no components should depend on Chrome.
     # Since //chrome depends on //extensions, we also only assert_no_deps on
     # extensions targets for non-lacros builds.
@@ -647,53 +217,68 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
     <Preference
         android:key="captions"
         android:title="@string/accessibility_captions_title"/>
+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
+@@ -32,6 +32,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+     public static final String PREF_CAPTIONS = "captions";
+     public static final String PREF_ZOOM_INFO = "zoom_info";
+ 
+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
+     private TextScalePreference mTextScalePref;
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+@@ -129,6 +131,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+             getPreferenceScreen().removePreference(readerForAccessibilityPref);
+         }
+ 
+        ChromeSwitchPreference forceTabletUiPref =
+                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
+        forceTabletUiPref.setOnPreferenceChangeListener(this);
+
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -190,6 +198,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
+         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
+             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
+            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
+         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
+             if (mReaderForAccessibilityDelegate != null) {
+                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
 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
-@@ -11,6 +11,15 @@ import org.chromium.content_public.browser.BrowserContextHandle;
-  * embedder-specific logic.
-  */
- public interface AccessibilitySettingsDelegate {
-+    /** An interface to control a single boolean preference. */
-+    interface BooleanPreferenceDelegate {
-+        /** @return whether the preference is enabled. */
-+        boolean isEnabled();
-+
-+        /** Called when the preference value is changed. */
-+        void setEnabled(boolean value);
-+    }
-+
-     /** An interface to control a single integer preference. */
-     interface IntegerPreferenceDelegate {
-         /** @return int - Current value of the preference of this instance. */
-@@ -26,6 +35,8 @@ public interface AccessibilitySettingsDelegate {
-     /** @return The BrowserContextHandle that should be used to read and update settings. */
-     BrowserContextHandle getBrowserContextHandle();
+@@ -52,6 +52,8 @@ public interface AccessibilitySettingsDelegate {
+      */
+     IntegerPreferenceDelegate getTextSizeContrastAccessibilityDelegate();
 
 +    BooleanPreferenceDelegate getForceTabletUIDelegate();
 +
     /**
-      * @return the InterPreferenceDelegate instance that should be used for reading and setting the
-      * text size contrast value for accessibility settings. Return null to omit the preference.
+      * Allows the embedder to add more preferences to the preference screen.
+      *
 diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
-@@ -31,6 +31,14 @@ public class DeviceFormFactor {
+@@ -31,6 +31,11 @@ public class DeviceFormFactor {
     /** Matches the value set in res/values-sw720dp/values.xml */
     private static final int SCREEN_BUCKET_LARGET_TABLET = 3;
 
-+    private static boolean mForceTabletUI = true;
+    private static boolean mForceTabletUI;
 +    public static void setForceTabletUI(boolean forceTabletUI) {
 +        mForceTabletUI = forceTabletUI;
 +    }
-+    public static boolean isForceTabletUI() {
-+        return mForceTabletUI;
-+    }
 +
     /**
      * Each activity could be on a different display, and this will just tell you whether the
      * display associated with the application context is "tablet sized".
-@@ -56,6 +64,7 @@ public class DeviceFormFactor {
+@@ -56,6 +61,7 @@ public class DeviceFormFactor {
      *         E.g. http://developer.samsung.com/samsung-dex/testing
      */
     public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -87,6 +87,11 @@ found in the LICENSE file.
+@@ -71,6 +71,11 @@ found in the LICENSE file.
         android:title="@string/incognito_settings_title"
         android:summary="@string/incognito_settings_summary"
         android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 import org.chromium.base.IntentUtils;
 import org.chromium.base.Log;
 import org.chromium.base.MemoryPressureListener;
-@@ -1644,8 +1645,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1614,8 +1615,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -58,8 +58,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.SpannableString;
- import android.view.Menu;
-@@ -18,6 +19,8 @@ import androidx.preference.Preference;
+ import android.text.style.ForegroundColorSpan;
+@@ -20,6 +21,8 @@ import androidx.preference.Preference;
 
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
@@ -68,16 +68,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -84,6 +87,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -87,6 +90,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private final SharedPreferencesManager mSharedPreferencesManager =
             ChromeSharedPreferences.getInstance();
 
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
 +
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
-     @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection";
-     @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection";
-@@ -316,7 +321,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     private IncognitoLockSettings mIncognitoLockSettings;
+ 
+@@ -271,7 +276,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
@@ -90,8 +90,8 @@ 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.equals(key)) {
-@@ -378,6 +387,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-                             getContext(), getProfile()));
+@@ -316,6 +325,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                     PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
         }
 
 +        ChromeSwitchPreference closeTabsOnExitPref =
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5155,6 +5155,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4805,6 +4805,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
       <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
         IMAGE
       </message>
@@ -23,15 +23,15 @@ 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
-@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingNotificationManager;
- import org.chromium.chrome.browser.data_sharing.SharedImageTilesCoordinator;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.hub.HubFieldTrial;
+@@ -22,6 +22,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.Supplier;
+ import org.chromium.base.task.PostTask;
+ import org.chromium.base.task.TaskTraits;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabCreationState;
 import org.chromium.chrome.browser.tab.TabLaunchType;
-@@ -62,6 +63,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate;
+@@ -47,6 +48,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.text.EmptyTextWatcher;
@@ -39,7 +39,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 
 import java.util.ArrayList;
 import java.util.List;
-@@ -802,11 +804,16 @@ public class TabGridDialogMediator
+@@ -636,11 +638,16 @@ public class TabGridDialogMediator
 
             assert relatedTabs.size() > 0;
 
@@ -60,7 +60,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
-@@ -20,6 +20,7 @@ import org.chromium.base.supplier.LazyOneshotSupplier;
+@@ -18,6 +18,7 @@ import org.chromium.base.supplier.LazyOneshotSupplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.supplier.OneshotSupplier;
@@ -68,7 +68,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
 import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -422,10 +423,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -375,10 +376,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                     assert relatedTabs.size() > 0;
 
                     parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -103,7 +103,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/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -238,6 +238,22 @@ public class HomepageManager
+@@ -233,6 +233,22 @@ public class HomepageManager
         notifyHomepageUpdated();
     }
 
@@ -165,7 +165,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
-@@ -111,7 +111,6 @@ public class LaunchMetrics {
+@@ -112,7 +112,6 @@ public class LaunchMetrics {
     public static void recordHomePageLaunchMetrics(
             boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
         if (homepageGurl.isEmpty()) {
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
 import org.chromium.chrome.browser.ntp.NewTabPageUtils;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
-@@ -518,6 +519,13 @@ public class ChromeTabCreator extends TabCreator {
+@@ -484,6 +485,13 @@ public class ChromeTabCreator extends TabCreator {
      * @return the created tab.
      */
     public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@@ -201,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -278,6 +278,7 @@ public final class ChromePreferenceKeys {
+@@ -283,6 +283,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";
 
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -61,6 +61,7 @@ public class LegacyChromePreferenceKeys {
+@@ -62,6 +62,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
                 ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -223,7 +223,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
-@@ -1411,6 +1411,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1337,6 +1337,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>
@@ -236,21 +236,21 @@ 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
-@@ -85,6 +85,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kShowForwardButton, true,
-       GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags());
+@@ -73,6 +73,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
+   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
+                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
 +                                PrefRegistry::NO_REGISTRATION_FLAGS);
 
   registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
-   registry->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
+   bool reset_check_default = false;
 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
-@@ -1321,6 +1321,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
- // toolbar.
- inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
+@@ -1285,6 +1285,10 @@ inline constexpr char kUsedPolicyCertificates[] =
+ // visible on the toolbar.
+ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
 
 +// A boolean specifying whether opening a new tab should open the Home page
 +// instead of the New Tab page.
@@ -8,52 +8,11 @@ Add DuckDuckGo Lite

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../search_engine_choice/default_favicon.png  | Bin 0 -> 903 bytes
- ...search_engine_choice_scaled_resources.grdp |   1 +
- .../search_engines/prepopulated_engines.json  |  31 ++++++++++++++++++
- .../search_engine_countries-inc.cc            |   3 ++
- .../search_engines/search_engine_type.h       |   5 +++
- 5 files changed, 40 insertions(+)
- create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
+ .../search_engines/prepopulated_engines.json  | 31 +++++++++++++++++++
+ .../search_engines/search_engine_type.h       |  5 +++
+ .../template_url_prepopulate_data.cc          |  3 ++
+ 3 files changed, 39 insertions(+)

-diff --git a/components/resources/default_100_percent/search_engine_choice/default_favicon.png b/components/resources/default_100_percent/search_engine_choice/default_favicon.png
-new file mode 100644
-index 0000000000000000000000000000000000000000..6533419f2d6b40f7735054dec62c51ddf1ee1201
-GIT binary patch
-literal 903
-zcmV;219<$2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009{Nkl<Zc-rk*
-zHI&>u5dJaD%uTpU6K1Ny)MmAo?2~ki?Li;rI(@haGcz+YGo$8ZtH|rstmUBf-W*z<
-z`LqMyjQ;vbR=naxn4FxTa$SOo%Y^Yq3CiCp`IM5k@HhA$JOj`EJVrBqK*>90<Y$Z!
-zD&E1~9|C4N=Y0}PoKKzZ=aBLV-UaWB-0*4BX4X}1up41G3JAO#bVTDWd3iku6Hh={
-zlma?HmsR5(hfh(b^FD*}4@!0sS4zV2hPiHTHz{QUr=p@EW3ne<xuXf?=gfeJ_n_0B
-z@lJY|QARx>G)Ly==Qj#^Pm*zg`6NIm=nm~RX-}Ss_k_usva+)JncnmH^XI=4jNih$
-zlz0y|WF4^Se4bG8m@v`L_#mWg6DB6I3T(&-X<X(aWBDC2?f1MT|2uB(BxS%X1$a%k
-z;1;{ldEPHo!pWN$|21g&X`3k)RVSdZ`1-to+dxbxpx11tSFj1eY4p>FfHecpOCzcg
-zpNwb+@DsmO2`6iI0DN;)MGkB;0q{--kR#0r9={VIfOiJ&qgPlcQV0O=qNN%EZUkK2
-zXVWfZ`h5{40I)Gg`DG2UD<uwqtRPHQ`3e=w!vhePgFgO88URJiY>`5mlRG3V0I)IO
-z^!VFvHvp@&1;F!4TUc<Tw?P23{124aYG2{<#pZ1%U*J~{i~%4NJtI_HQU19p>56LN
-z%3gt$n(-Z(idK@zIi#qli66~IxloAGzuNPP+NSLfTs{_pT7f^J06kI9KUZ>A$&#d(
-z+ZUd3gy@cNAuWhQ3vePzWtVK-4H5_<h_y6oOLkRNRsEA)yhw>iqgo-eCg3jF08o2(
-zV+xr@B`n6nQmpYnUx3CSsDwu5Yyvoe1poxnZ<>do)Aj_?EW-9wQ^cQO=(N_*SpEcF
-zA!n{N_=ZMrDQ)uj`{u@re$c++TFQW?-c&%T<H_NEl62(&6TL7nfTD(I>Jej=5G2dk
-zc*-y0$13Q-mVE%=HZZcm54P~5#qa<$Vkc|B{qUnj<Z#y}04P$B=OI-_I^4yL*CEaE
-zjS0pJfK7T{VJFY4st5f9G(|wnQru>jUSTzPpE5qa;Lv>bM_w_-mwYy_S=Aoxnl--Y
-d#;<tA>kFnu^?NN9uE_uZ002ovPDHLkV1m60sc!%P
-
-literal 0
-HcmV?d00001
-
-diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/components/resources/search_engine_choice_scaled_resources.grdp
--- a/components/resources/search_engine_choice_scaled_resources.grdp
-+++ b/components/resources/search_engine_choice_scaled_resources.grdp
-@@ -5,6 +5,7 @@
-   <if expr="_google_chrome">
-     <structure type="chrome_scaled_image" name="IDR_GOOGLE_COM_PNG" file="google_chrome/google_search_logo.png" />
-   </if>
-+  <structure type="chrome_scaled_image" name="IDR_GOOGLEEN_PNG" file="search_engine_choice/default_favicon.png" />
-   <structure type="chrome_scaled_image" name="IDR_AR_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
-   <structure type="chrome_scaled_image" name="IDR_AT_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
-   <structure type="chrome_scaled_image" name="IDR_AU_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
@@ -74,7 +33,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
     "ecosia": {
       "name": "Ecosia",
       "keyword": "ecosia.org",
-@@ -174,6 +184,27 @@
+@@ -171,6 +181,27 @@
       "id": 111
     },
 
@@ -102,34 +61,15 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
     "mail_ru": {
       "name": "@MAIL.RU",
       "keyword": "mail.ru",
-diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
--- a/components/search_engines/search_engine_countries-inc.cc
-+++ b/components/search_engines/search_engine_countries-inc.cc
-@@ -33,6 +33,7 @@ struct EngineAndTier {
- 
- // Default (for countries with no better engine set)
- constexpr EngineAndTier engines_default[] = {
-+    {SearchEngineTier::kTopEngines, &googleen},
-     {SearchEngineTier::kTopEngines, &google},
-     {SearchEngineTier::kTopEngines, &bing},
-     {SearchEngineTier::kTopEngines, &yahoo},
-@@ -1449,5 +1450,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
-   for (size_t i = 0; i < num_engines; i++) {
-     t_url.push_back(engines[i]);
-   }
-+  t_url.push_back({SearchEngineTier::kTopEngines, &googleen});
-+  t_url.push_back({SearchEngineTier::kTopEngines, &duckduckgo_light});
-   return t_url;
- }
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -91,10 +91,15 @@ enum SearchEngineType {
+@@ -90,10 +90,15 @@ enum SearchEngineType {
+   SEARCH_ENGINE_KARMA = 71,
   SEARCH_ENGINE_YOU = 72,
   SEARCH_ENGINE_STARTER_PACK_ASK_GOOGLE = 73,
-   SEARCH_ENGINE_LILO = 74,
-+  SEARCH_ENGINE_GOOGLE_EN = 75,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
+  SEARCH_ENGINE_GOOGLE_EN = 74,
+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 75,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };
@@ -140,4 +80,24 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 // Enum to record the type of search engine a user used in keyword mode. This
 // should be kept aligned with the `OmniboxBuiltinEngineType` enum in enums.xml.
 // Entries should not be renumbered and numeric values should never be reused.
+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
+@@ -63,6 +63,7 @@ struct EngineAndTier {
+ 
+ // Default (for countries with no better engine set)
+ constexpr EngineAndTier engines_default[] = {
+    {SearchEngineTier::kTopEngines, &googleen},
+     {SearchEngineTier::kTopEngines, &google},
+     {SearchEngineTier::kTopEngines, &bing},
+     {SearchEngineTier::kTopEngines, &yahoo},
+@@ -1683,6 +1684,8 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
+   for (size_t i = 0; i < num_engines; i++) {
+     t_url.push_back(engines[i]);
+   }
+  t_url.push_back({SearchEngineTier::kTopEngines, &googleen});
+  t_url.push_back({SearchEngineTier::kTopEngines, &duckduckgo_light});
+   return t_url;
+ }
+ 
 --
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 chrome/app/settings_strings.grdp              | 10 +++
 .../browsing_data/browsing_data_bridge.cc     |  2 +-
 .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
- .../chrome_browsing_data_remover_delegate.cc  | 13 ++++
+ .../chrome_browsing_data_remover_delegate.cc  | 11 +++
 .../api/settings_private/prefs_util.cc        | 17 +++++
 .../browser/profiles/ProfileManagerUtils.java |  5 ++
 .../profiles/android/profile_manager_utils.cc |  5 ++
@@ -22,22 +22,20 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../clear_browsing_data_dialog.ts             |  2 +
 .../strings/android_chrome_strings.grd        |  3 +
 .../settings_localized_strings_provider.cc    |  1 +
- .../content/browsing_data_helper.cc           |  5 +-
 .../core/browsing_data_policies_utils.cc      | 20 ++---
 .../core/browsing_data_policies_utils.h       | 11 +++
- .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
+ .../browsing_data/core/browsing_data_utils.cc | 34 +++++++++
 .../core/clear_browsing_data_tab.h            |  2 +-
 components/browsing_data/core/pref_names.cc   | 17 +++++
 components/browsing_data/core/pref_names.h    | 10 +++
- .../search_engines/template_url_service.cc    |  1 +
 content/browser/storage_partition_impl.cc     |  1 +
- 27 files changed, 316 insertions(+), 18 deletions(-)
+ 25 files changed, 312 insertions(+), 17 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java

 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -306,6 +306,7 @@ chrome_java_sources = [
+@@ -307,6 +307,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java",
@@ -48,7 +46,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -171,6 +171,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -169,6 +169,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;
@@ -56,7 +54,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.reengagement.ReengagementNotificationController;
 import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification;
-@@ -1644,7 +1645,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1614,7 +1615,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             Intent intent = getIntent();
 
             boolean hadCipherData =
@@ -72,7 +70,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -460,6 +460,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -435,6 +435,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
     /** Returns whether is a basic or advanced Clear Browsing Data tab. */
     protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
 
@@ -83,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     /**
      * Decides whether a given dialog option should be selected when the dialog is initialized.
      *
-@@ -540,6 +544,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -514,6 +518,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
      * options.
      */
     private void onClearButtonClicked() {
@@ -91,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         if (shouldShowImportantSitesDialog()) {
             showImportantDialogThenClear();
             return;
-@@ -572,6 +577,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -546,6 +551,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
         Button clearButton = (Button) getView().findViewById(R.id.clear_button);
         boolean isEnabled = !getSelectedOptions().isEmpty();
         clearButton.setEnabled(isEnabled);
@@ -163,7 +161,7 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    protected List<Integer> getDialogOptions(Bundle fragmentArgs) {
+    protected List<Integer> getDialogOptions() {
 +        return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA,
 +                DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS,
 +                DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS);
@@ -190,7 +188,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 
     private Profile mProfile;
     private ClearBrowsingDataFetcher mFetcher;
-@@ -113,6 +113,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -93,6 +93,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
                 return getActivity().getString(R.string.clear_browsing_data_basic_tab_title);
             case 1:
                 return getActivity().getString(R.string.prefs_section_advanced);
@@ -199,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
             default:
                 throw new RuntimeException("invalid position: " + position);
         }
-@@ -161,6 +163,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -136,6 +138,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
                 case 1:
                     fragment = new ClearBrowsingDataFragmentAdvanced();
                     break;
@@ -212,9 +210,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2416,6 +2416,16 @@
-   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
-     Delete browsing data
+@@ -2244,6 +2244,16 @@
+   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for clear browsing data button in Privacy options">
+     Clear 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.">
@@ -226,13 +224,13 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 +      At Startup
 +    </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.">
-     Delete history, cookies, cache, and more
+   <message name="IDS_SETTINGS_CLEAR_DATA_DESCRIPTION" desc="Description for clear 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.">
+     Clear history, cookies, cache, and more
   </message>
 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
-@@ -340,7 +340,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
+@@ -331,7 +331,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
     const JavaParamRef<jobject>& jprofile,
     jint tab_index) {
   DCHECK_GE(tab_index, 0);
@@ -283,7 +281,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
-@@ -442,6 +442,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -436,6 +436,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           CreateTaskCompletionClosure(TracingDataType::kHistory),
           &history_task_tracker_);
     }
@@ -293,7 +291,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     if (ClipboardRecentContent::GetInstance())
       ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
 
-@@ -492,7 +495,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -486,7 +489,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_CONTENTS |
           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_HISTORY);
     }
@@ -303,7 +301,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     // The saved Autofill profiles and credit cards can include the origin from
     // which these profiles and credit cards were learned.  These are a form of
     // history, so clear them as well.
-@@ -513,7 +518,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -507,7 +512,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
       if (data_manager)
         data_manager->Refresh();
     }
@@ -313,7 +311,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     base::ThreadPool::PostTaskAndReply(
         FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
         base::BindOnce(
-@@ -588,9 +595,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -582,9 +589,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     }
 
     device_event_log::Clear(delete_begin_, delete_end_);
@@ -327,19 +325,10 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
         delete_begin_, delete_end_);
 
-@@ -1257,6 +1268,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
- 
-     if (should_clear_zero_suggest_and_session_token && template_url_service)
-       template_url_service->ClearSessionToken();
-+
-+    template_url_service->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
-   }
- 
-   //////////////////////////////////////////////////////////////////////////////
 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
-@@ -526,6 +526,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -513,6 +513,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
   (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
       settings_api::PrefType::kNumber;
 
@@ -385,7 +374,7 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc
 --- a/chrome/browser/profiles/android/profile_manager_utils.cc
 +++ b/chrome/browser/profiles/android/profile_manager_utils.cc
-@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
+@@ -62,3 +62,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
       g_browser_process->profile_manager()->GetLoadedProfiles(),
       RemoveSessionCookiesForProfile);
 }
@@ -397,7 +386,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
-@@ -1477,6 +1477,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1488,6 +1488,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
   }
 }
 
@@ -417,7 +406,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_ ||
-@@ -2141,7 +2154,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2155,7 +2168,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
   Profile* original_profile = profile->GetOriginalProfile();
   // Do nothing if the closed window is not the last window of the same profile.
   for (Browser* browser_iter : *BrowserList::GetInstance()) {
@@ -441,7 +430,7 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles
 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
-@@ -318,6 +318,50 @@
+@@ -305,6 +305,50 @@
                 disabled="[[clearingInProgress_]]" no-set-pref>
             </settings-checkbox>
           </div>
@@ -495,7 +484,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -297,6 +297,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -302,6 +302,7 @@ export class SettingsClearBrowsingDataDialogElement extends
         value: () =>
             [loadTimeData.getString('basicPageTitle'),
              loadTimeData.getString('advancedPageTitle'),
@@ -503,20 +492,20 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
     ],
       },
 
-@@ -423,6 +424,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -425,6 +426,7 @@ export class SettingsClearBrowsingDataDialogElement extends
     }
     this.clearButtonDisabled_ =
-         this.getSelectedDataTypes_(page as HTMLElement).length === 0;
-+    if ((page as HTMLElement).id == "atstart-tab") this.clearButtonDisabled_ = true;
+         this.getSelectedDataTypes_(tab as HTMLElement).length === 0;
+    if ((tab as HTMLElement).id == "atstart-tab") this.clearButtonDisabled_ = true;
   }
 
   /**
 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
-@@ -1506,6 +1506,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>.
+@@ -1432,6 +1432,9 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_CLEAR_BROWSING_DATA_BASIC_TAB_TITLE" desc="The title of the tab showing the basic clear browsing data options.">
+         Basic
       </message>
 +      <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
@@ -527,7 +516,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1775,6 +1775,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1674,6 +1674,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
       {"clearedData", IDS_SETTINGS_CLEARED_DATA},
       {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
       {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -535,22 +524,6 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
       {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
       {"safeBrowsingEnableExtendedReportingDesc",
        IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
-diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc
--- a/components/browsing_data/content/browsing_data_helper.cc
-+++ b/components/browsing_data/content/browsing_data_helper.cc
-@@ -40,8 +40,11 @@ bool WebsiteSettingsFilterAdapter(
-   // this filter is used for is DURABLE_STORAGE, which also only uses
-   // origin-scoped patterns. Such patterns can be directly translated to a GURL.
-   GURL url(primary_pattern.ToString());
-  DCHECK(url.is_valid()) << "url: '" << url.possibly_invalid_spec() << "' "
-+  if (!url.is_valid()) {
-+    LOG(INFO) << "url: '" << url.possibly_invalid_spec() << "' "
-                          << "pattern: '" << primary_pattern.ToString() << "'";
-+    return true;
-+  }
-   return predicate.Run(url);
- }
- 
 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
@@ -610,7 +583,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
-@@ -318,6 +318,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -318,6 +318,40 @@ bool GetDeletionPreferenceFromDataType(
     BrowsingDataType data_type,
     ClearBrowsingDataTab clear_browsing_data_tab,
     std::string* out_pref) {
@@ -622,7 +595,7 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::CACHE:
 +        *out_pref = prefs::kDeleteCacheAtStart;
 +        return true;
-+      case BrowsingDataType::SITE_DATA:
+      case BrowsingDataType::COOKIES:
 +        *out_pref = prefs::kDeleteCookiesAtStart;
 +        return true;
 +      case BrowsingDataType::PASSWORDS:
@@ -631,6 +604,8 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::FORM_DATA:
 +        *out_pref = prefs::kDeleteFormDataAtStart;
 +        return true;
+      case BrowsingDataType::BOOKMARKS:
+        return false;
 +      case BrowsingDataType::SITE_SETTINGS:
 +        *out_pref = prefs::kDeleteSiteSettingsAtStart;
 +        return true;
@@ -640,7 +615,8 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::HOSTED_APPS_DATA:
 +        *out_pref = prefs::kDeleteHostedAppsDataAtStart;
 +        return true;
-+      case BrowsingDataType::TABS:
+      case BrowsingDataType::NUM_TYPES:
+        NOTREACHED();  // This is not an actual type.
 +        return false;
 +    }
 +  }
@@ -655,15 +631,15 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
 //
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
-enum class ClearBrowsingDataTab { BASIC, ADVANCED, MAX_VALUE = ADVANCED };
-+enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, MAX_VALUE = AT_START };
+-enum class ClearBrowsingDataTab { BASIC, ADVANCED, NUM_TYPES };
+enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, NUM_TYPES };
 
 }  // namespace browsing_data
 
 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
-@@ -29,6 +29,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -47,6 +47,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       kClearBrowsingDataHistoryNoticeShownTimes, 0);
 
@@ -685,8 +661,8 @@ diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_d
 +      kDeleteSiteSettingsAtStart, false);
 +
 #if !BUILDFLAG(IS_IOS)
-   registry->RegisterBooleanPref(kDeleteDownloadHistory, true);
-   registry->RegisterBooleanPref(kDeleteHostedAppsData, false);
+   registry->RegisterBooleanPref(
+       kDeleteDownloadHistory, true,
 diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_data/core/pref_names.h
 --- a/components/browsing_data/core/pref_names.h
 +++ b/components/browsing_data/core/pref_names.h
@@ -707,21 +683,10 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
 // Clear browsing data deletion time period.
 inline constexpr char kDeleteTimePeriod[] = "browser.clear_data.time_period";
 inline constexpr char kDeleteTimePeriodBasic[] =
-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
-@@ -819,6 +819,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())))) {
 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
-@@ -1533,6 +1533,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1488,6 +1488,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
@@ -9,7 +9,6 @@ Need: bromite-build-utils.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/android/java/res/values/ids.xml        |  1 +
- .../settings/AccessibilitySettings.java       | 12 +++++++
 .../ChromeAccessibilitySettingsDelegate.java  | 18 ++++++++++
 .../contextmenu/ChromeContextMenuItem.java    |  5 ++-
 .../ChromeContextMenuPopulator.java           |  5 +++
@@ -19,17 +18,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/flags/ChromeFeatureList.java      |  5 +++
 .../strings/android_chrome_strings.grd        |  9 +++++
 .../res/xml/accessibility_preferences.xml     |  5 +++
+ .../accessibility/AccessibilitySettings.java  | 11 ++++++
 .../AccessibilitySettingsDelegate.java        |  2 ++
 ...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 +
 .../renderer/core/html/html_anchor_element.cc | 36 +++++++++++++++----
- .../renderer/core/html/html_anchor_element.h  |  7 +++-
+ .../renderer/core/html/html_anchor_element.h  |  9 +++--
 .../renderer/core/html/html_image_element.cc  | 17 +++++++++
 .../renderer/core/html/html_image_element.h   |  2 ++
- .../core/page/context_menu_controller.cc      | 33 ++++++++++++-----
+ .../core/page/context_menu_controller.cc      | 32 ++++++++++++-----
 .../core/page/context_menu_controller.h       |  5 +--
- 21 files changed, 165 insertions(+), 20 deletions(-)
+ 21 files changed, 164 insertions(+), 21 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
@@ -45,46 +45,10 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 
     <!-- Tags -->
     <item type="id" name="highlight_color" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -55,6 +55,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
-     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
- 
-+    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
-+    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
-+
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -174,6 +177,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled());
-         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
- 
-+        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
-+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
-+        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
-+        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.isEnabled());
-+        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -262,6 +271,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             mDelegate.requestRestart(getActivity());
-         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
-             mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue);
-+        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
-+            mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue);
-+            mDelegate.requestRestart(getActivity());
-         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
-             // TODO(mschillaci): Implement the override behavior for OS level.
-         }
 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
-@@ -136,6 +136,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -163,6 +163,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
             mSnackbarManager.showSnackbar(mSnackbar);
     }
 
@@ -107,8 +71,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +    }
 +
     @Override
-     public BrowserContextHandle getBrowserContextHandle() {
-         return mProfile;
+     public void addExtraPreferences(PreferenceFragmentCompat fragment) {
+         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
@@ -164,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -297,6 +297,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -273,6 +273,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
         mTab.loadUrl(loadUrlParams);
     }
 
@@ -194,10 +158,10 @@ diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/con
 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
-@@ -293,6 +293,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -280,6 +280,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kTabGroupParityAndroid,
-     &kTabIdMapAndroid,
     &kTabletTabSwitcherLongPressMenu,
+     &kTabletToolbarIncognitoStatus,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
     &kTabletToolbarReordering,
     &kTabResumptionModuleAndroid,
@@ -205,8 +169,8 @@ 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
-@@ -366,6 +366,8 @@ public abstract class ChromeFeatureList {
-             "DisableToolbarSwipeUp";
+@@ -342,6 +342,8 @@ public abstract class ChromeFeatureList {
+     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
             "MoveTopToolbarToBottom";
 +    public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS =
@@ -214,18 +178,18 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
     public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
             "NotificationPermissionBottomSheet";
-@@ -650,6 +652,8 @@ public abstract class ChromeFeatureList {
-             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
+@@ -619,6 +621,8 @@ public abstract class ChromeFeatureList {
+             newCachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false);
     public static final CachedFlag sMoveTopToolbarToBottom =
             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
 +    public static final CachedFlag sShowAlwaysContextMenuOnLinks =
 +            newCachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false);
-     public static final CachedFlag sPrivacyGuidePreloadAndroid =
-             newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);
+     public static final CachedFlag sOmniboxModernizeVisualUpdate =
+             newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true);
     public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -808,6 +812,7 @@ public abstract class ChromeFeatureList {
-                     sTabWindowManagerIndexReassignmentActivityNotInAppTasks,
+@@ -771,6 +775,7 @@ public abstract class ChromeFeatureList {
                     sTabWindowManagerReportIndicesMismatch,
+                     sToolbarUseHardwareBitmapDraw,
                     sUseChimeAndroidSdk,
 +                    sShowAlwaysContextMenuOnLinks,
                     sUseLibunwindstackNativeUnwinderAndroid,
@@ -234,9 +198,9 @@ 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
-@@ -1729,6 +1729,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
+@@ -1638,6 +1638,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_MOVE_TOOLBAR_BOTTOM_SUMMARY" desc="Summary of the preference that allows the user to move toolbar on bottom.">
+         Move toolbar to bottom
       </message>
 +      <message name="IDS_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS_TITLE" desc="Title of the preference that open the context menu in links.">
 +        Always open the context menu in the links
@@ -247,7 +211,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]">
-@@ -3016,6 +3022,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -2779,6 +2785,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
       <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
         Open in new Chrome tab
       </message>
@@ -272,12 +236,54 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
         android:key="force_enable_zoom"
         android:summary="@string/force_enable_zoom_summary"
+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 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+     private BooleanPreferenceDelegate mForceTabletUIDelegate;
+     static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
+     static final String PREF_MOVE_TOOLBAR_TO_BOTTOM = "move_toolbar_bottom";
+    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
+     private TextScalePreference mTextScalePref;
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+@@ -45,6 +46,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+     private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
+     private double mPageZoomLatestDefaultZoomPrefValue;
+     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
+    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
+ 
+     private FontSizePrefs mFontSizePrefs;
+     private FontSizePrefsObserver mFontSizePrefsObserver =
+@@ -149,6 +151,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+         mMoveToolbarToBottomPref.setChecked(mMoveTopToolbarToBottomDelegate.isEnabled());
+         mMoveToolbarToBottomPref.setOnPreferenceChangeListener(this);
+ 
+        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
+        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
+        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.isEnabled());
+        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
+
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -226,6 +234,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+         } else if (PREF_MOVE_TOOLBAR_TO_BOTTOM.equals(preference.getKey())) {
+             mMoveTopToolbarToBottomDelegate.setEnabled((Boolean) newValue);
+             mDelegate.requestRestart(getActivity());
+        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
+            mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue);
+            mDelegate.requestRestart(getActivity());
+         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
+             // TODO(mschillaci): Implement the override behavior for OS level.
+         }
 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
-@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate {
+@@ -43,6 +43,8 @@ public interface AccessibilitySettingsDelegate {
+ 
     BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate();
-     BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate();
 
 +    BooleanPreferenceDelegate getShowAlwaysContextMenuOnLinksDelegate();
 +
@@ -314,15 +320,15 @@ 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
-@@ -63,6 +63,7 @@
- #include "third_party/blink/renderer/core/loader/render_blocking_resource_manager.h"
+@@ -59,6 +59,7 @@
+ #include "third_party/blink/renderer/core/loader/ping_loader.h"
 #include "third_party/blink/renderer/core/navigation_api/navigation_api.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
 +#include "third_party/blink/renderer/core/page/context_menu_controller.h"
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -515,6 +516,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+@@ -467,6 +468,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
                                             bool is_trusted,
                                             base::TimeTicks platform_time_stamp,
                                             KURL completed_url) {
@@ -340,8 +346,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   LocalDOMWindow* window = GetDocument().domWindow();
   if (!window) {
     return;
-@@ -576,6 +588,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
-             request.GetReferrerPolicy()));
+@@ -527,6 +539,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+             /*element=*/this, request.HasUserGesture()));
   }
 
 +  if (!do_not_show_context_menu &&
@@ -356,16 +362,16 @@ 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;
 
-@@ -629,7 +650,7 @@ AtomicString HTMLAnchorElement::interestAction() const {
-   return g_empty_atom;
+@@ -559,7 +580,7 @@ void HTMLAnchorElement::SetHovered(bool hovered) {
+   HTMLElement::SetHovered(hovered);
 }
 
-void HTMLAnchorElement::HandleClick(MouseEvent& event) {
-+void HTMLAnchorElement::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
+-void HTMLAnchorElement::HandleClick(Event& event) {
+void HTMLAnchorElement::HandleClick(Event& event, bool do_not_show_context_menu) {
   event.SetDefaultHandled();
 
   LocalDOMWindow* window = GetDocument().domWindow();
-@@ -725,13 +746,12 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -656,13 +677,12 @@ void HTMLAnchorElement::HandleClick(Event& event) {
     return;
   }
 
@@ -383,7 +389,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(
-@@ -741,7 +761,9 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -672,7 +692,9 @@ void HTMLAnchorElement::HandleClick(Event& event) {
     frame->GetEventHandler().SetDelayedNavigationTaskHandle(
         std::move(task_handle));
   } else {
@@ -397,31 +403,37 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
-@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
-   AtomicString interestAction() const override;
+@@ -106,6 +106,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+   void SetHovered(bool hovered) override;
 
   void Trace(Visitor*) const override;
-+  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
+  void HandleClick(Event&, bool do_not_show_context_menu = false);
 
  protected:
   void ParseAttribute(const AttributeModificationParams&) override;
-@@ -143,7 +144,11 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
-                            bool is_trusted,
-                            base::TimeTicks platform_time_stamp,
-                            KURL);
-  void HandleClick(MouseEvent&);
-+ void NavigateToHyperlink2(ResourceRequest,
+@@ -130,12 +131,16 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+   bool IsInteractiveContent() const final;
+   InsertionNotificationRequest InsertedInto(ContainerNode&) override;
+   void RemovedFrom(ContainerNode&) override;
+  void NavigateToHyperlink2(ResourceRequest,
 +                           NavigationPolicy,
 +                           bool is_trusted,
 +                           base::TimeTicks platform_time_stamp,
 +                           KURL, Event&, bool do_not_show_context_menu);
+   void NavigateToHyperlink(ResourceRequest,
+                            NavigationPolicy,
+                            bool is_trusted,
+                            base::TimeTicks platform_time_stamp,
+-                           KURL);
+-  void HandleClick(Event&);
+                           KURL completed_url);
 
   unsigned link_relations_ : 31;
   mutable LinkHash cached_visited_link_hash_;
 diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
 --- a/third_party/blink/renderer/core/html/html_image_element.cc
 +++ b/third_party/blink/renderer/core/html/html_image_element.cc
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
 #include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h"
 #include "third_party/blink/renderer/core/dom/node_traversal.h"
 #include "third_party/blink/renderer/core/dom/shadow_root.h"
@@ -429,7 +441,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"
-@@ -64,6 +65,7 @@
+@@ -65,6 +66,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"
@@ -437,7 +449,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"
-@@ -800,6 +802,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -803,6 +805,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
   }
 }
 
@@ -462,7 +474,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -222,6 +222,8 @@ class CORE_EXPORT HTMLImageElement
+@@ -236,6 +236,8 @@ class CORE_EXPORT HTMLImageElement final
   void DidAddUserAgentShadowRoot(ShadowRoot&) override;
   void AdjustStyle(ComputedStyleBuilder&) override;
 
@@ -474,7 +486,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc
 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -231,14 +231,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -225,14 +225,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
   }
 }
 
@@ -494,7 +506,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
     mouse_event->SetDefaultHandled();
 }
 
-@@ -456,7 +458,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -450,7 +452,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
 bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                             const PhysicalOffset& point,
                                             WebMenuSourceType source_type,
@@ -504,15 +516,14 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
   // Displaying the context menu in this function is a big hack as we don't
   // have context, i.e. whether this is being invoked via a script or in
   // response to user input (Mouse event WM_RBUTTONDOWN,
-@@ -479,6 +482,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -473,6 +476,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
   if (!result.InnerNodeOrImageMapImage())
     return false;
 
 +  if (!do_not_show_context_menu &&
 +        base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
 +    if (auto* anchor_element = DynamicTo<HTMLAnchorElement>(result.URLElement())) {
-+      MouseEvent event;
-+      event.SetTarget(mouse_event->target());
+      Event event;
 +      anchor_element->HandleClick(event, /*do_not_show_context_menu*/true);
 +      return true;
 +    }
@@ -521,7 +532,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;
-@@ -833,11 +846,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -831,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
   SetAutofillData(result.InnerNode(), data);
   SetPasswordManagerData(result.InnerElement(), data);
 
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -155,6 +155,7 @@
+@@ -153,6 +153,7 @@
 #include "components/send_tab_to_self/features.h"
 #include "components/services/heap_profiling/public/cpp/switches.h"
 #include "components/services/storage/public/cpp/buckets/bucket_info.h"
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
 --- a/chrome/browser/engagement/important_sites_util.cc
 +++ b/chrome/browser/engagement/important_sites_util.cc
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/site_engagement/content/site_engagement_score.h"
 #include "components/site_engagement/content/site_engagement_service.h"
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
 #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h"
 #include "components/webapps/browser/banners/app_banner_settings_helper.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-@@ -386,6 +387,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -387,6 +388,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
 // static
 std::set<std::string> ImportantSitesUtil::GetInstalledRegisterableDomains(
     Profile* profile) {
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
   std::set<GURL> installed_origins = GetOriginsWithInstalledWebApps(profile);
   std::set<std::string> registerable_domains;
 
-@@ -400,6 +405,10 @@ std::vector<ImportantDomainInfo>
+@@ -401,6 +406,10 @@ std::vector<ImportantDomainInfo>
 ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
                                                     size_t max_results) {
   SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime");
@@ -68,15 +68,15 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
 diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc
 --- a/components/feature_engagement/internal/tracker_impl.cc
 +++ b/components/feature_engagement/internal/tracker_impl.cc
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
+ #include "base/task/single_thread_task_runner.h"
 #include "base/time/clock.h"
 #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
 +#include "components/site_engagement/core/features.h"
 #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"
-@@ -212,6 +213,8 @@ TrackerImpl::TrackerImpl(
+@@ -211,6 +212,8 @@ TrackerImpl::TrackerImpl(
 TrackerImpl::~TrackerImpl() = default;
 
 void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -96,12 +96,12 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 #include "components/feature_engagement/public/configuration.h"
 #include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/feature_constants.h"
-@@ -117,6 +118,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -111,6 +112,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
   }
 
 #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +  if (!base::FeatureList::IsEnabled(site_engagement::features::kSiteEngagement)) {
-+    std::optional<FeatureConfig> config = FeatureConfig();
+    absl::optional<FeatureConfig> config = FeatureConfig();
 +    config->valid = false;
 +    return config;
 +  }
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -96,6 +96,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
+@@ -86,6 +86,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
 import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
 import org.chromium.components.browser_ui.settings.PaddedItemDecorationWithDivider;
 import org.chromium.components.browser_ui.settings.SettingsLauncher;
@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
 import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
 import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
-@@ -481,8 +482,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -457,8 +458,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
             finish();
             return true;
         } else if (item.getItemId() == R.id.menu_id_general_help) {
@@ -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
-@@ -32,6 +32,16 @@ File OpenContentUriForRead(const FilePath& content_uri) {
+@@ -30,6 +30,16 @@ File OpenContentUriForRead(const FilePath& content_uri) {
   return File(fd);
 }
 
@@ -36,7 +36,7 @@ Enabled by default
 .../platform/graphics/bitmap_image_metrics.h  |   4 +-
 .../renderer/platform/image-decoders/BUILD.gn |   9 +
 .../platform/image-decoders/image_decoder.cc  |  23 +
- .../image-decoders/jxl/jxl_image_decoder.cc   | 685 ++++++++++++++++++
+ .../image-decoders/jxl/jxl_image_decoder.cc   | 683 ++++++++++++++++++
 .../image-decoders/jxl/jxl_image_decoder.h    | 123 ++++
 .../jxl/jxl_image_decoder_test.cc             | 626 ++++++++++++++++
 .../blink/tools/commit_stats/git-dirs.txt     |   1 +
@@ -58,7 +58,7 @@ Enabled by default
 .../libjxl/gen_headers/jxl/jxl_export.h       |  11 +
 tools/metrics/histograms/enums.xml            |   1 +
 .../histograms/metadata/blink/enums.xml       |   2 +-
- 53 files changed, 1997 insertions(+), 17 deletions(-)
+ 53 files changed, 1995 insertions(+), 17 deletions(-)
 create mode 100644 build/linux/unbundle/libjxl.gn
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc
@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -494,6 +494,10 @@ vars = {
+@@ -489,6 +489,10 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -92,10 +92,10 @@ diff --git a/DEPS b/DEPS
 +  # Three lines of non-changing comments so that
 +  # the commit queue can handle CLs rolling feed
 +  # and whatever else without interference from each other.
-   'highway_revision': '8295336dd70f1201d42c22ab5b0861de38cf8fbf',
+   'highway_revision': '8f20644eca693cfb74aa795b0006b6779c370e7a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ffmpeg
-@@ -1604,6 +1608,9 @@ deps = {
+@@ -1107,6 +1111,9 @@ deps = {
   'src/third_party/dawn':
     Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
 
@@ -147,14 +147,14 @@ new file mode 100644
 diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/replace_gn_files.py
 --- a/build/linux/unbundle/replace_gn_files.py
 +++ b/build/linux/unbundle/replace_gn_files.py
-@@ -57,6 +57,7 @@ REPLACEMENTS = {
-     'libdrm': 'third_party/libdrm/BUILD.gn',
-     'libevent': 'third_party/libevent/BUILD.gn',
-     'libjpeg': 'third_party/libjpeg.gni',
-+    'libjxl' : 'third_party/libjxl/BUILD.gn',
-     'libpng': 'third_party/libpng/BUILD.gn',
-     'libsecret': 'third_party/libsecret/BUILD.gn',
-     'libusb': 'third_party/libusb/BUILD.gn',
+@@ -55,6 +55,7 @@ REPLACEMENTS = {
+   'libdrm': 'third_party/libdrm/BUILD.gn',
+   'libevent': 'third_party/libevent/BUILD.gn',
+   'libjpeg': 'third_party/libjpeg.gni',
+  'libjxl' : 'third_party/libjxl/BUILD.gn',
+   'libpng': 'third_party/libpng/BUILD.gn',
+   'libsecret' : 'third_party/libsecret/BUILD.gn',
+   'libusb': 'third_party/libusb/BUILD.gn',
 diff --git a/cc/base/devtools_instrumentation.cc b/cc/base/devtools_instrumentation.cc
 --- a/cc/base/devtools_instrumentation.cc
 +++ b/cc/base/devtools_instrumentation.cc
@@ -171,7 +171,7 @@ diff --git a/cc/base/devtools_instrumentation.cc b/cc/base/devtools_instrumentat
 diff --git a/cc/base/devtools_instrumentation.h b/cc/base/devtools_instrumentation.h
 --- a/cc/base/devtools_instrumentation.h
 +++ b/cc/base/devtools_instrumentation.h
-@@ -71,7 +71,7 @@ class CC_BASE_EXPORT ScopedLayerTask {
+@@ -72,7 +72,7 @@ class CC_BASE_EXPORT ScopedLayerTask {
 
 class CC_BASE_EXPORT ScopedImageTask {
  public:
@@ -329,7 +329,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
 +++ b/net/base/mime_util.cc
-@@ -169,6 +169,7 @@ static const MimeInfo kPrimaryMappings[] = {
+@@ -164,6 +164,7 @@ static const MimeInfo kPrimaryMappings[] = {
     {"image/avif", "avif"},
     {"image/gif", "gif"},
     {"image/jpeg", "jpeg,jpg"},
@@ -337,7 +337,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
     {"image/png", "png"},
     {"image/apng", "png,apng"},
     {"image/svg+xml", "svg,svgz"},
-@@ -672,6 +673,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
+@@ -667,6 +668,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
                                                   "image/gif",
                                                   "image/ief",
                                                   "image/jpeg",
@@ -348,7 +348,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 --- a/net/base/mime_util_unittest.cc
 +++ b/net/base/mime_util_unittest.cc
-@@ -44,6 +44,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
+@@ -39,6 +39,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
       {FILE_PATH_LITERAL("webm"), "video/webm"},
       {FILE_PATH_LITERAL("weba"), "audio/webm"},
       {FILE_PATH_LITERAL("avif"), "image/avif"},
@@ -356,7 +356,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
       {FILE_PATH_LITERAL("epub"), "application/epub+zip"},
       {FILE_PATH_LITERAL("apk"), "application/vnd.android.package-archive"},
       {FILE_PATH_LITERAL("cer"), "application/x-x509-ca-cert"},
-@@ -85,6 +86,7 @@ TEST(MimeUtilTest, ExtensionTest) {
+@@ -80,6 +81,7 @@ TEST(MimeUtilTest, ExtensionTest) {
     {FILE_PATH_LITERAL("webm"), {"video/webm"}},
     {FILE_PATH_LITERAL("weba"), {"audio/webm"}},
     {FILE_PATH_LITERAL("avif"), {"image/avif"}},
@@ -364,7 +364,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 #if BUILDFLAG(IS_CHROMEOS_ASH)
     // These are test cases for testing platform mime types on ChromeOS.
     {FILE_PATH_LITERAL("epub"), {"application/epub+zip"}},
-@@ -501,6 +503,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
+@@ -496,6 +498,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
       {"MeSsAge/*", 1, "eml"},
       {"message/", 0, nullptr, true},
       {"image/avif", 1, "avif"},
@@ -375,7 +375,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 diff --git a/third_party/.gitignore b/third_party/.gitignore
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
-@@ -92,6 +92,7 @@
+@@ -90,6 +90,7 @@
 /libgifcodec
 /libjingle/source
 /libupnp
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -4431,6 +4431,7 @@ domain Emulation
+@@ -4294,6 +4294,7 @@ domain Emulation
   experimental type DisabledImageType extends string
     enum
       avif
@@ -478,7 +478,7 @@ diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/t
 diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
-@@ -500,10 +500,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
+@@ -502,10 +502,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
   String header(network_utils::ImageAcceptHeader());
   for (String type : *disabled_image_types) {
     // The header string is expected to be like
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent
     header.Replace(String(type + ","), "");
   }
   return AtomicString(header);
-@@ -848,6 +848,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
+@@ -850,6 +850,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
   namespace DisabledImageTypeEnum = protocol::Emulation::DisabledImageTypeEnum;
   for (protocol::Emulation::DisabledImageType type : *disabled_types) {
     if (DisabledImageTypeEnum::Avif == type ||
@@ -608,7 +608,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2351,6 +2351,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2280,6 +2280,10 @@ source_set("blink_platform_unittests_sources") {
     sources += [ "text/locale_icu_test.cc" ]
   }
 
@@ -619,10 +619,10 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
   sources += [ "testing/run_all_tests.cc" ]
 
   configs += [
-@@ -2396,6 +2400,7 @@ source_set("blink_platform_unittests_sources") {
+@@ -2323,6 +2327,7 @@ source_set("blink_platform_unittests_sources") {
+     "//third_party/blink/renderer/platform/scheduler:unit_tests",
     "//third_party/blink/renderer/platform/wtf",
-     "//third_party/dawn/src/dawn/native",
-     "//third_party/dawn/src/dawn/wire",
+     "//third_party/libavif:libavif",
 +    "//third_party/libjxl:libjxl",
     "//third_party/libyuv",
     "//third_party/webrtc/api/task_queue:task_queue_test",
@@ -663,7 +663,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.c
 diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h b/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 --- a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 +++ b/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
-@@ -32,8 +32,8 @@ class PLATFORM_EXPORT BitmapImageMetrics {
+@@ -29,8 +29,8 @@ class PLATFORM_EXPORT BitmapImageMetrics {
     kICO = 5,
     kBMP = 6,
     kAVIF = 7,
@@ -677,7 +677,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
-@@ -70,6 +70,15 @@ component("image_decoders") {
+@@ -72,6 +72,15 @@ component("image_decoders") {
     "//third_party/libyuv",
   ]
 
@@ -696,26 +696,33 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third
 diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
+ #include <memory>
 
- #include "base/containers/heap_array.h"
 #include "base/logging.h"
 +#include "base/feature_list.h"
- #include "base/numerics/byte_conversions.h"
 #include "base/numerics/safe_conversions.h"
+ #include "base/sys_byteorder.h"
 #include "base/trace_event/trace_event.h"
-@@ -50,6 +51,10 @@
- #include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.h"
+@@ -30,6 +31,7 @@
+ #include "media/media_buildflags.h"
+ #include "skia/ext/cicp.h"
+ #include "third_party/blink/public/common/buildflags.h"
+#include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h"
+ #include "third_party/blink/renderer/platform/image-decoders/exif_reader.h"
+@@ -47,6 +49,9 @@
+ #include "third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.h"
 #endif
 
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +#include "third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.h"
 +#endif
-+
 namespace blink {
 
 namespace {
-@@ -77,6 +82,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
+@@ -74,6 +79,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
   if (image_extension == "avif") {
     return cc::ImageType::kAVIF;
   }
@@ -727,7 +734,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 #endif
   return cc::ImageType::kInvalid;
 }
-@@ -198,6 +208,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
+@@ -191,6 +201,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
     return "image/avif";
   }
 #endif
@@ -740,10 +747,10 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 
   return String();
 }
-@@ -309,6 +325,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
-           alpha_option, high_bit_depth_decoding_option, color_behavior,
-           max_decoded_bytes, animation_option);
-     }
+@@ -296,6 +312,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
+     decoder = std::make_unique<AVIFImageDecoder>(
+         alpha_option, high_bit_depth_decoding_option, color_behavior,
+         max_decoded_bytes, animation_option);
 +#endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +  } else if (base::FeatureList::IsEnabled(blink::features::kJXL) &&
@@ -758,7 +765,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_de
 new file mode 100644
 --- /dev/null
 +++ b/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.cc
-@@ -0,0 +1,685 @@
+@@ -0,0 +1,683 @@
 +// Copyright 2021 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -808,12 +815,11 @@ new file mode 100644
 +  // The input ColorProfile owns the buffer memory, make a new copy for
 +  // the newly created one and pass the ownership of the new copy to the new
 +  // color profile.
-+  auto owned_buffer = base::HeapArray<uint8_t>::Uninit(buffer_donor.GetProfile()->size);
-+  owned_buffer.copy_from(
-+    base::span<const uint8_t>(
-+      static_cast<const uint8_t*>(buffer_donor.GetProfile()->buffer),
-+      buffer_donor.GetProfile()->size));
-+  new_profile.buffer = std::move(owned_buffer.data());
+  std::unique_ptr<uint8_t[]> owned_buffer(
+      new uint8_t[buffer_donor.GetProfile()->size]);
+  memcpy(owned_buffer.get(), buffer_donor.GetProfile()->buffer,
+         buffer_donor.GetProfile()->size);
+  new_profile.buffer = owned_buffer.get();
 +  return std::make_unique<ColorProfile>(new_profile, std::move(owned_buffer));
 +}
 +}  // namespace
@@ -1138,8 +1144,7 @@ new file mode 100644
 +                                     JXL_COLOR_PROFILE_TARGET_DATA,
 +                                     icc_profile.data(), icc_profile.size())) {
 +            profile =
-+                ColorProfile::Create(
-+                  base::span(icc_profile.data(), icc_profile.size()));
+                ColorProfile::Create(icc_profile.data(), icc_profile.size());
 +            have_data_profile = true;
 +
 +            // Detect whether the ICC profile approximately equals PQ or HLG,
@@ -2217,7 +2222,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
 diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
 --- a/third_party/blink/web_tests/TestExpectations
 +++ b/third_party/blink/web_tests/TestExpectations
-@@ -4730,6 +4730,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -4559,6 +4559,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
 # Started failing after rolling new version of check-layout-th.js
 css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
 
@@ -2233,9 +2238,9 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
 diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
 --- a/third_party/blink/web_tests/VirtualTestSuites
 +++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -444,6 +444,15 @@
+@@ -102,6 +102,15 @@
              "--disable-threaded-compositing", "--disable-threaded-animation"],
-     "expires": "Jun 1, 2025"
+     "expires": "Jul 1, 2023"
   },
 +  {
 +    "prefix": "jxl-enabled",
@@ -2247,7 +2252,7 @@ diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/w
 +    "expires": "Jul 1, 2023"
 +  },
   {
-     "prefix": "highdpi-threaded",
+     "prefix": "unsafe_webgpu",
     "platforms": ["Linux", "Mac", "Win"],
 diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/emulation/emulation-set-disabled-image-types-jxl-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/emulation/emulation-set-disabled-image-types-jxl-expected.txt
 new file mode 100644
@@ -2648,7 +2653,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -20875,6 +20875,7 @@ from previous Chrome versions.
+@@ -21104,6 +21104,7 @@ from previous Chrome versions.
   <int value="188610022" label="NewMessageListView:enabled"/>
   <int value="189728101" label="FasterLocationReload:disabled"/>
   <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
@@ -2667,5 +2672,5 @@ diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/h
 +  <int value="8" label="kImageJXL"/>
 </enum>
 
- <enum name="DigitalIdentityRequestStatus">
+ <enum name="FedCmAccountsResponseInvalidReason">
 --
@@ -189,7 +189,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -85,6 +85,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
+@@ -84,6 +84,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
   return settings;
 }
 
@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -116,6 +116,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts {
 
 enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
 
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -289,6 +289,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -311,6 +311,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_);
-@@ -558,25 +565,6 @@ static String ExtractWebGLContextCreationError(
+@@ -584,25 +591,6 @@ static String ExtractWebGLContextCreationError(
     const Platform::GraphicsInfo& info) {
   StringBuilder builder;
   builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                           builder);
   builder.Append('.');
-@@ -636,6 +624,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -662,6 +650,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
     const CanvasContextCreationAttributesCore& attributes,
     Platform::ContextType context_type,
     Platform::GraphicsInfo* graphics_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
-@@ -1967,6 +1967,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+@@ -1960,6 +1960,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
                         DOMArrayBufferView* pixels,
                         int64_t offset);
 
@@ -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"
-@@ -841,6 +842,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -847,6 +848,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
       // origin.
       WebRTCIPHandlingPolicy policy =
           GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
@@ -219,7 +219,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
-@@ -286,6 +288,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -287,6 +289,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1044,6 +1046,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1062,6 +1064,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 --- a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 +++ b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
-@@ -383,6 +383,13 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -368,6 +368,13 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
     return;
   }
 
@@ -7,9 +7,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/net/chrome_report_sender.cc       |  1 +
 .../browser/devtools/protocol/network_handler.cc |  2 ++
 .../cross_origin_embedder_policy_reporter.cc     |  7 +++++--
+ .../cross_origin_opener_policy_reporter.cc       | 16 +++++++---------
 .../browser/network/reporting_service_proxy.cc   |  3 +++
 .../renderer_host/render_frame_host_impl.cc      |  6 ------
- .../coop/cross_origin_opener_policy_reporter.cc  | 16 +++++++---------
 .../web_package/signed_exchange_reporter.cc      |  2 ++
 ...content_switch_dependent_feature_overrides.cc |  1 +
 .../Allow-building-without-enable_reporting.inc  |  2 ++
@@ -41,7 +41,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1462,6 +1462,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1400,6 +1400,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
   }
 }
 
@@ -49,7 +49,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
 std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
   std::vector<GURL> urls;
   frame_host->ForEachRenderFrameHostWithAction(
-@@ -1475,6 +1476,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1413,6 +1414,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
       });
   return urls;
 }
@@ -65,19 +65,19 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
 #include "content/browser/network/cross_origin_embedder_policy_reporter.h"
 
 +#include "net/base/features.h"
- #include <string_view>
- 
+ #include "base/strings/string_piece.h"
 #include "base/values.h"
-@@ -96,8 +97,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
+ #include "content/public/browser/storage_partition.h"
+@@ -95,8 +96,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
 void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-     std::initializer_list<std::pair<std::string_view, std::string_view>> body,
+     std::initializer_list<std::pair<base::StringPiece, base::StringPiece>> body,
     bool report_only) {
 -  const std::optional<std::string>& endpoint =
 -      report_only ? report_only_endpoint_ : endpoint_;
   const char* const disposition = report_only ? "reporting" : "enforce";
   if (observer_) {
     std::vector<blink::mojom::ReportBodyElementPtr> list;
-@@ -112,6 +111,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+@@ -111,6 +110,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
     observer_->Notify(blink::mojom::Report::New(
         kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
   }
@@ -87,7 +87,7 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
   if (endpoint) {
     base::Value::Dict body_to_pass;
     for (const auto& pair : body) {
-@@ -126,6 +128,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+@@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
           /*user_agent=*/std::nullopt, std::move(body_to_pass));
     }
   }
@@ -95,51 +95,9 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
 }
 
 }  // namespace content
-diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browser/network/reporting_service_proxy.cc
--- a/content/browser/network/reporting_service_proxy.cc
-+++ b/content/browser/network/reporting_service_proxy.cc
-@@ -11,6 +11,7 @@
- #include "base/memory/ref_counted.h"
- #include "base/unguessable_token.h"
- #include "base/values.h"
-+#include "net/base/features.h"
- #include "content/browser/service_worker/service_worker_host.h"
- #include "content/browser/worker_host/dedicated_worker_host.h"
- #include "content/browser/worker_host/shared_worker_host.h"
-@@ -175,12 +176,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
-                    const std::string& group,
-                    const std::string& type,
-                    base::Value::Dict body) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-     auto* rph = RenderProcessHost::FromID(render_process_id_);
-     if (!rph)
-       return;
-     rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
-         type, group, url, reporting_source_, network_anonymization_key_,
-         /*user_agent=*/std::nullopt, std::move(body));
-+#endif
-   }
- 
-   const int 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
-@@ -14404,12 +14404,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
-       }
-     }
-   }
-
-  // Send the crash report to the Reporting API.
-  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
-      /*type=*/"crash", /*group=*/"default", last_committed_url_,
-      GetReportingSource(), isolation_info_.network_anonymization_key(),
-      /*user_agent=*/std::nullopt, std::move(body));
- }
- 
- void RenderFrameHostImpl::SendCommitNavigation(
-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
+diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/content/browser/network/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/network/cross_origin_opener_policy_reporter.cc
+++ b/content/browser/network/cross_origin_opener_policy_reporter.cc
@@ -18,25 +18,17 @@
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "services/network/public/mojom/source_location.mojom.h"
@@ -214,6 +172,48 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 }
 
 }  // namespace content
+diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browser/network/reporting_service_proxy.cc
+--- a/content/browser/network/reporting_service_proxy.cc
+++ b/content/browser/network/reporting_service_proxy.cc
+@@ -11,6 +11,7 @@
+ #include "base/memory/ref_counted.h"
+ #include "base/unguessable_token.h"
+ #include "base/values.h"
+#include "net/base/features.h"
+ #include "content/browser/service_worker/service_worker_host.h"
+ #include "content/browser/worker_host/dedicated_worker_host.h"
+ #include "content/browser/worker_host/shared_worker_host.h"
+@@ -175,12 +176,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+                    const std::string& group,
+                    const std::string& type,
+                    base::Value::Dict body) {
+#if BUILDFLAG(ENABLE_REPORTING)
+     auto* rph = RenderProcessHost::FromID(render_process_id_);
+     if (!rph)
+       return;
+     rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
+         type, group, url, reporting_source_, network_anonymization_key_,
+         /*user_agent=*/std::nullopt, std::move(body));
+#endif
+   }
+ 
+   const int 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
+@@ -13787,12 +13787,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+   base::Value::Dict body;
+   if (!reason.empty())
+     body.Set("reason", reason);
+-
+-  // Send the crash report to the Reporting API.
+-  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
+-      /*type=*/"crash", /*group=*/"default", last_committed_url_,
+-      GetReportingSource(), isolation_info_.network_anonymization_key(),
+-      std::nullopt /* user_agent */, std::move(body));
+ }
+ 
+ void RenderFrameHostImpl::SendCommitNavigation(
 diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
@@ -254,7 +254,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -196,6 +196,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
+@@ -229,6 +229,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
     base::Seconds(30));
 
 #if BUILDFLAG(ENABLE_REPORTING)
@@ -281,7 +281,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -467,10 +467,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -464,10 +464,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
       const std::optional<base::UnguessableToken>& reporting_source,
       const net::NetworkAnonymizationKey& network_anonymization_key,
       const std::optional<std::string>& user_agent,
@@ -297,7 +297,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1491,7 +1491,6 @@ mojom("mojom") {
+@@ -1443,7 +1443,6 @@ mojom("mojom") {
     export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
     export_header_blink = "third_party/blink/public/platform/web_common.h"
     if (enable_reporting) {
@@ -308,7 +308,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
-@@ -1223,6 +1223,7 @@ interface NetworkContext {
+@@ -1206,6 +1206,7 @@ interface NetworkContext {
   // provided |network_isolation_key|.
   //
   // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -316,7 +316,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
   QueueReport(string type,
               string group,
               url.mojom.Url url,
-@@ -1236,6 +1237,7 @@ interface NetworkContext {
+@@ -1219,6 +1220,7 @@ interface NetworkContext {
   // Note that this queued report will never be delivered if no reporting
   // endpoint matching is registered for with the provided
   // |network_isolation_key|.
@@ -335,7 +335,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 #include "base/containers/contains.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/ranges/algorithm.h"
-@@ -1239,6 +1240,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1167,6 +1168,7 @@ void ContentSecurityPolicy::ReportViolation(
     return;
   }
 
@@ -343,7 +343,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);
 
-@@ -1246,6 +1248,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1174,6 +1176,7 @@ void ContentSecurityPolicy::ReportViolation(
   // `context_frame` (i.e. we're not processing 'frame-ancestors').
   if (delegate_ && !context_frame)
     delegate_->DispatchViolationEvent(*violation_data, element);
@@ -362,8 +362,8 @@ 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"
-@@ -2735,9 +2736,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
-   v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
+@@ -2619,9 +2620,11 @@ void LocalFrame::MainFrameInteractive() {
+   v8_local_compile_hints_producer_->GenerateData();
 }
 
 +#if BUILDFLAG(ENABLE_REPORTING)
@@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -661,8 +662,9 @@ class CORE_EXPORT LocalFrame final
+@@ -657,8 +658,9 @@ class CORE_EXPORT LocalFrame final
   void FinishedScrollSequence();
 
   SmoothScrollSequencer* GetSmoothScrollSequencer() const;
@@ -4,37 +4,49 @@ Subject: Allow building without supervised users

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/BUILD.gn                       |  1 -
- .../browser/feed/FeedSurfaceCoordinator.java  |  5 +----
- chrome/browser/BUILD.gn                       |  2 --
- .../prefs/chrome_pref_service_factory.cc      |  2 +-
- .../profiles/profile_attributes_entry.cc      |  2 +-
- chrome/browser/profiles/profile_impl.cc       |  5 +----
- chrome/browser/profiles/profile_manager.cc    | 20 -------------------
- chrome/browser/ui/webui/managed_ui_handler.cc |  4 ----
- .../webui/management/management_ui_handler.cc |  4 ----
- .../browser/supervised_user_pref_store.cc     |  1 +
- .../browser/supervised_user_preferences.cc    |  6 +++++-
- .../core/browser/supervised_user_service.cc   |  5 +----
- .../core/browser/supervised_user_utils.cc     |  1 +
- .../supervised_user/core/common/features.cc   |  6 ++++++
- 14 files changed, 18 insertions(+), 46 deletions(-)
+ chrome/android/BUILD.gn                                     | 1 -
+ chrome/android/chrome_java_sources.gni                      | 1 -
+ .../chrome/browser/feed/FeedSurfaceCoordinator.java         | 5 +----
+ chrome/browser/BUILD.gn                                     | 6 ------
+ .../browser/extensions/api/settings_private/prefs_util.cc   | 2 ++
+ chrome/browser/profiles/profile_impl.cc                     | 4 ++++
+ chrome/browser/profiles/profile_manager.cc                  | 4 ++++
+ chrome/browser/ui/webui/managed_ui_handler.cc               | 2 ++
+ chrome/browser/ui/webui/management/management_ui_handler.cc | 2 ++
+ components/supervised_user/buildflags.gni                   | 6 +-----
+ .../core/browser/supervised_user_preferences.cc             | 2 +-
+ .../supervised_user/core/browser/supervised_user_utils.cc   | 4 ++++
+ components/supervised_user/core/common/features.cc          | 1 +
+ components/supervised_user/core/common/pref_names.h         | 4 ++++
+ .../core/common/supervised_user_constants.cc                | 2 ++
+ 15 files changed, 28 insertions(+), 18 deletions(-)

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -757,7 +757,6 @@ if (current_toolchain == default_toolchain) {
-       "//components/dom_distiller/core:distiller_type_java",
-       "//components/ntp_tiles:ntp_tiles_enums_java",
-       "//components/offline_pages/core:offline_page_model_enums_java",
-      "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
-       "//net:effective_connection_type_java",
-     ]
- 
+@@ -3697,7 +3697,6 @@ generate_jni("chrome_jni_headers") {
+     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
+     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
+     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
+-    "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java",
+     "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
+     "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
+     "java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
+diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
+--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
+@@ -1085,7 +1085,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/suggestions/tile/TileGroupDelegateImpl.java",
+   "java/src/org/chromium/chrome/browser/suggestions/tile/TileRenderer.java",
+   "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java",
+-  "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java",
+   "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
+   "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
+   "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
 diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
 +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
-@@ -67,7 +67,6 @@ import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
+@@ -68,7 +68,6 @@ import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.prefs.PrefService;
@@ -42,7 +54,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
 import org.chromium.ui.base.DeviceFormFactor;
-@@ -788,9 +787,7 @@ public class FeedSurfaceCoordinator
+@@ -775,9 +774,7 @@ public class FeedSurfaceCoordinator
      * Returns true if the supervised user feed should be displayed.
      */
     public boolean shouldDisplaySupervisedFeed() {
@@ -56,7 +68,7 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3271,8 +3271,6 @@ static_library("browser") {
+@@ -3165,8 +3165,6 @@ static_library("browser") {
       "feed/android/refresh_task_scheduler_impl.cc",
       "feed/android/refresh_task_scheduler_impl.h",
       "feed/android/web_feed_bridge.cc",
@@ -65,196 +77,215 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
       "file_select_helper_contacts_android.cc",
       "file_select_helper_contacts_android.h",
       "first_run/android/first_run_prefs.cc",
-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
-@@ -324,7 +324,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) {
-     scoped_refptr<PrefStore> supervised_user_prefs =
-         base::MakeRefCounted<SupervisedUserPrefStore>(supervised_user_settings);
-     DCHECK(async || supervised_user_prefs->IsInitializationComplete());
-diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
--- a/chrome/browser/profiles/profile_attributes_entry.cc
-+++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -422,7 +422,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
- }
+@@ -3371,10 +3369,6 @@ static_library("browser") {
+       "ssl/chrome_security_state_model_delegate.h",
+       "ssl/known_interception_disclosure_infobar.cc",
+       "ssl/known_interception_disclosure_infobar.h",
+-      "supervised_user/android/favicon_fetcher.cc",
+-      "supervised_user/android/favicon_fetcher.h",
+-      "supervised_user/android/supervised_user_web_content_handler_impl.cc",
+-      "supervised_user/android/supervised_user_web_content_handler_impl.h",
+       "sync/glue/synced_tab_delegate_android.cc",
+       "sync/glue/synced_tab_delegate_android.h",
+       "sync/glue/synced_window_delegate_android.cc",
+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
+@@ -1024,9 +1024,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+       settings_api::PrefType::kBoolean;
+ #endif
 
- std::string ProfileAttributesEntry::GetSupervisedUserId() const {
-  return GetString(kSupervisedUserId);
-+  return "";
- }
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   // Supervised Users.  This setting is queried in our Tast tests (b/241943380).
+   (*s_allowlist)[::prefs::kSupervisedUserExtensionsMayRequestPermissions] =
+       settings_api::PrefType::kBoolean;
+#endif
 
- bool ProfileAttributesEntry::IsEphemeral() const {
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   (*s_allowlist)[::prefs::kUseAshProxy] = settings_api::PrefType::kBoolean;
 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
-@@ -694,10 +694,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -689,10 +689,12 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
     prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
 
   pref_change_registrar_.Init(prefs);
-  pref_change_registrar_.Add(
-      prefs::kSupervisedUserId,
-      base::BindRepeating(&ProfileImpl::UpdateSupervisedUserIdInStorage,
-                          base::Unretained(this)));
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   pref_change_registrar_.Add(
+       prefs::kSupervisedUserId,
+       base::BindRepeating(&ProfileImpl::UpdateSupervisedUserIdInStorage,
+                           base::Unretained(this)));
+#endif
 
   // Changes in the profile avatar.
   pref_change_registrar_.Add(
-@@ -1624,6 +1620,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1627,11 +1629,13 @@ GURL ProfileImpl::GetHomePage() {
 }
 
 void ProfileImpl::UpdateSupervisedUserIdInStorage() {
-+  if ((true)) return;
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage()
                                       .GetProfileAttributesWithPath(GetPath());
+   if (entry)
+     entry->SetSupervisedUserId(GetPrefs()->GetString(prefs::kSupervisedUserId));
+#endif
+ }
+ 
+ void ProfileImpl::UpdateNameInStorage() {
 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
-@@ -1210,23 +1210,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1215,6 +1215,7 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
   }
 
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  bool force_supervised_user_id =
-#if BUILDFLAG(IS_CHROMEOS_ASH)
-      !ash::IsSigninBrowserContext(profile) &&
-      !ash::IsLockScreenAppBrowserContext(profile) &&
-#endif
-      command_line->HasSwitch(switches::kSupervisedUserId);
-
-  if (force_supervised_user_id) {
-    supervised_user_id =
-        command_line->GetSwitchValueASCII(switches::kSupervisedUserId);
-  }
-  if (force_supervised_user_id ||
-      !profile->GetPrefs()->HasPrefPath(prefs::kSupervisedUserId)) {
-    profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
-                                   supervised_user_id);
-  }
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+   bool force_supervised_user_id =
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -1236,6 +1237,7 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
+                                    supervised_user_id);
+   }
+#endif
 #if !BUILDFLAG(IS_ANDROID)
   if (profile->IsNewProfile()) {
     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
-@@ -2038,9 +2021,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -2035,8 +2037,10 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
   init_params.icon_index =
       profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
 
-  init_params.supervised_user_id =
-      profile->GetPrefs()->GetString(prefs::kSupervisedUserId);
-
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   init_params.supervised_user_id =
+       profile->GetPrefs()->GetString(prefs::kSupervisedUserId);
+#endif
+ 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   user_manager::User* user =
-       ash::ProfileHelper::Get()->GetUserByProfile(profile);
 diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc
 --- a/chrome/browser/ui/webui/managed_ui_handler.cc
 +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
-@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() {
-     auto domain = static_cast<policy::PolicyDomain>(i);
+@@ -90,9 +90,11 @@ void ManagedUIHandler::AddObservers() {
     policy_service->AddObserver(domain, this);
   }
-
-  pref_registrar_.Add(prefs::kSupervisedUserId,
-                      base::BindRepeating(&ManagedUIHandler::NotifyIfChanged,
-                                          base::Unretained(this)));
+ 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   pref_registrar_.Add(prefs::kSupervisedUserId,
+                       base::BindRepeating(&ManagedUIHandler::NotifyIfChanged,
+                                           base::Unretained(this)));
+#endif
 }
 
 void ManagedUIHandler::RemoveObservers() {
 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
-@@ -546,10 +546,6 @@ bool ManagementUIHandler::managed() const {
+@@ -1507,10 +1507,12 @@ void ManagementUIHandler::AddObservers() {
 
- void ManagementUIHandler::RegisterPrefChange(
-     PrefChangeRegistrar& pref_registrar) {
-  pref_registrar_.Add(
-      prefs::kSupervisedUserId,
-      base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
-                          base::Unretained(this)));
+   pref_registrar_.Init(profile->GetPrefs());
+ 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+   pref_registrar_.Add(
+       prefs::kSupervisedUserId,
+       base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
+                           base::Unretained(this)));
+#endif
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+   pref_registrar_.Add(
+diff --git a/components/supervised_user/buildflags.gni b/components/supervised_user/buildflags.gni
+--- a/components/supervised_user/buildflags.gni
+++ b/components/supervised_user/buildflags.gni
+@@ -4,9 +4,5 @@
+ 
+ declare_args() {
+   # Enables supervision for Family Link users.
+-  enable_supervised_users =
+-      # Platforms which fully support supervision features:
+-      is_android || is_chromeos ||
+-      # Platforms for which support is currently in development:
+-      is_ios || is_linux || is_mac || is_win
+  enable_supervised_users = false
 }
- 
- void ManagementUIHandler::UpdateManagedState() {
-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
-@@ -126,6 +126,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() {}
- 
- void SupervisedUserPrefStore::OnNewSettingsAvailable(
-     const base::Value::Dict& settings) {
-+  if ((true)) return;
-   std::unique_ptr<PrefValueMap> old_prefs = std::move(prefs_);
-   prefs_ = std::make_unique<PrefValueMap>();
-   if (!settings.empty()) {
 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
-@@ -164,6 +164,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -173,7 +173,7 @@ bool IsChildAccountStatusKnown(const PrefService& pref_service) {
 }
 
- void EnableParentalControls(PrefService& pref_service) {
-+  if ((true)) {
-+    DisableParentalControls(pref_service);
-+    return;
-+  }
-   pref_service.SetString(prefs::kSupervisedUserId,
-                          supervised_user::kChildAccountSUID);
-   SetIsChildAccountStatusKnown(pref_service);
-@@ -186,7 +190,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
- }
- 
- bool IsSubjectToParentalControls(const PrefService& pref_service) {
+ bool IsChildAccount(const PrefService& pref_service) {
 -  return pref_service.GetString(prefs::kSupervisedUserId) == kChildAccountSUID;
 +  return false;
 }
 
- bool AreExtensionsPermissionsEnabled(const PrefService& pref_service) {
-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
-@@ -48,10 +48,6 @@ void SupervisedUserService::Init() {
-   DCHECK(settings_service_->IsReady());
- 
-   pref_change_registrar_.Init(&user_prefs_.get());
-  pref_change_registrar_.Add(
-      prefs::kSupervisedUserId,
-      base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged,
-                          base::Unretained(this)));
-   FirstTimeInterstitialBannerState banner_state =
-       static_cast<FirstTimeInterstitialBannerState>(
-           user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState));
-@@ -189,6 +185,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState(
- }
- 
- void SupervisedUserService::SetActive(bool active) {
-+  active = false;
-   if (active_ == active) {
-     return;
-   }
+ bool IsSafeSitesEnabled(const PrefService& pref_service) {
 diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/components/supervised_user/core/browser/supervised_user_utils.cc
 --- a/components/supervised_user/core/browser/supervised_user_utils.cc
 +++ b/components/supervised_user/core/browser/supervised_user_utils.cc
-@@ -132,6 +132,7 @@ GURL NormalizeUrl(const GURL& url) {
+@@ -81,11 +81,15 @@ GURL NormalizeUrl(const GURL& url) {
 }
 
 bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
-+  if ((true)) return true;
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   return pref_service
              .FindPreference(prefs::kDefaultSupervisedUserFilteringBehavior)
              ->IsDefaultValue() ||
+          pref_service.FindPreference(prefs::kSupervisedUserSafeSites)
+              ->IsDefaultValue();
+#else
+  return true;
+#endif
+ }
+ 
+ bool EmitLogRecordHistograms(
 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
-@@ -143,4 +143,10 @@ bool IsShadowKidsApiWithSafeSitesEnabled() {
+@@ -163,4 +163,5 @@ bool IsShadowKidsApiWithSafeSitesEnabled() {
   return base::FeatureList::IsEnabled(kShadowKidsApiWithSafeSites);
 }
 
-+SET_CROMITE_FEATURE_DISABLED(kKidFriendlyContentFeed);
-+SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+SET_CROMITE_FEATURE_DISABLED(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
-+#endif
-+
+SET_CROMITE_FEATURE_DISABLED(kForceGoogleSafeSearchForSupervisedUsers);
 }  // namespace supervised_user
+diff --git a/components/supervised_user/core/common/pref_names.h b/components/supervised_user/core/common/pref_names.h
+--- a/components/supervised_user/core/common/pref_names.h
+++ b/components/supervised_user/core/common/pref_names.h
+@@ -5,8 +5,10 @@
+ #ifndef COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
+ #define COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
+ 
+#include "components/supervised_user/core/common/buildflags.h"
+ #include "extensions/buildflags/buildflags.h"
+ 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ namespace prefs {
+ 
+ // A bool pref that keeps whether the child status for this profile was already
+@@ -132,4 +134,6 @@ inline constexpr char kFirstTimeInterstitialBannerState[] =
+ 
+ }  // namespace prefs
+ 
+#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+
+ #endif  // COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
+diff --git a/components/supervised_user/core/common/supervised_user_constants.cc b/components/supervised_user/core/common/supervised_user_constants.cc
+--- a/components/supervised_user/core/common/supervised_user_constants.cc
+++ b/components/supervised_user/core/common/supervised_user_constants.cc
+@@ -70,6 +70,7 @@ const char kChromeOSAvatarIndex[] = "chromeos-avatar-index";
+ 
+ const char kChromeOSPasswordData[] = "chromeos-password-data";
+ 
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ const char* const kCustodianInfoPrefs[] = {
+     prefs::kSupervisedUserCustodianName,
+     prefs::kSupervisedUserCustodianEmail,
+@@ -82,6 +83,7 @@ const char* const kCustodianInfoPrefs[] = {
+     prefs::kSupervisedUserSecondCustodianProfileURL,
+     prefs::kSupervisedUserSecondCustodianProfileImageURL,
+ };
+#endif
+ 
+ const base::FilePath::CharType kSupervisedUserSettingsFilename[] =
+     FILE_PATH_LITERAL("Managed Mode Settings");
 --
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1230,6 +1230,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1181,6 +1181,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3576,7 +3582,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3524,7 +3530,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
           : HasAudio();
 
   // Audio only stream is allowed to play when in background.
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
-@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -200,6 +200,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
   bool HasVideo() const override;
   bool HasAudio() const override;
 
@@ -17,15 +17,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 import org.chromium.chrome.browser.DefaultBrowserInfo;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -36,6 +37,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -35,6 +36,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
- import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
-@@ -234,6 +236,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+@@ -219,6 +221,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
             Referrer referrer,
             boolean navigateToTab,
             @Nullable AdditionalNavigationParams additionalNavigationParams) {
@@ -33,7 +33,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());
-@@ -250,6 +253,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -235,6 +238,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
 
     @Override
     public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
@@ -6,21 +6,21 @@ Ignore any partner-provided home page.

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../chromium/chrome/browser/homepage/HomepageManager.java    | 4 ----
- .../partnercustomizations/PartnerBrowserCustomizations.java  | 2 +-
- .../org/chromium/components/search_engines/TemplateUrl.java  | 1 +
- .../search_engines/android/template_url_service_android.cc   | 5 +----
- .../always-use-new-tab-page-for-default-home-page.inc        | 2 ++
- 5 files changed, 5 insertions(+), 9 deletions(-)
+ .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ----
+ .../partnercustomizations/PartnerBrowserCustomizations.java   | 2 +-
+ .../org/chromium/components/search_engines/TemplateUrl.java   | 1 +
+ .../search_engines/android/template_url_service_android.cc    | 1 +
+ .../always-use-new-tab-page-for-default-home-page.inc         | 2 ++
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -156,10 +156,6 @@ public class HomepageManager
-      *     tab page if the homepage button is force enabled via flag.
+@@ -152,10 +152,6 @@ public class HomepageManager
+      *         tab page if the homepage button is force enabled via flag.
      */
-     public GURL getDefaultHomepageGurl() {
+     public static GURL getDefaultHomepageGurl() {
 -        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
 -            return PartnerBrowserCustomizations.getInstance().getHomePageUrl();
 -        }
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -72,6 +72,7 @@ public class TemplateUrl {
+@@ -69,6 +69,7 @@ public class TemplateUrl {
      *     prepopulated_engines.json.
      */
     public String getNewTabURL() {
@@ -54,14 +54,10 @@ 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
-@@ -405,10 +405,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -330,6 +330,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
     const base::android::JavaParamRef<jstring>&
         jimage_translate_target_language_param_key,
     jboolean set_as_default) {
-  // The function is scheduled to run only when the service is loaded, see
-  // `TemplateUrlService#runWhenLoaded()`.
-  CHECK(template_url_service_->loaded(), base::NotFatalUntil::M128);
-
 +  if ((true)) return false;
   // Check if there is already a search engine created from Play API.
   TemplateURLService::TemplateURLVector template_urls =
@@ -1,64 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Wed, 22 May 2024 07:41:34 +0000
-Subject: Android Toolbar Scroll Ablation setting
-
-Adds a setting for blocking the toolbar hiding
-
-need: Add-cromite-flags-support.patch
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- .../Toolbar-Scroll-Ablation-flag.grdp                |  9 +++++++++
- .../java/res/xml/accessibility_preferences.xml       |  6 ++++++
- .../about_flags_cc/Toolbar-Scroll-Ablation-flag.inc  | 12 ++++++++++++
- 3 files changed, 27 insertions(+)
- create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
- create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
-
-diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
-new file mode 100644
--- /dev/null
-+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<grit-part>
-+    <message name="IDS_LOCK_TOOLBAR_TITLE" desc="Text for 'Always show toolbar' settings option.">
-+        Always show toolbar
-+    </message>
-+    <message name="IDS_LOCK_TOOLBAR_SUMMARY" desc="Summary text for 'Always show toolbar' settings option.">
-+        Blocks the toolbar's hiding
-+    </message>
-+</grit-part>
-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
-@@ -73,6 +73,12 @@ found in the LICENSE file.
-         android:key="disable_toolbar_swipeup"
-         android:title="@string/disable_toolbar_swipe_up" />
- 
-+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
-+        android:title="@string/lock_toolbar_title"
-+        android:summary="@string/lock_toolbar_summary"
-+        app:featureName="android-toolbar-scroll-ablation"
-+        app:needRestart="true" />
-+
-     <PreferenceCategory
-         android:key="customize_selecton_popup_section"
-         android:title="@string/customize_selecton_popup_title" />
-diff --git a/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
-@@ -0,0 +1,12 @@
-+#if BUILDFLAG(IS_ANDROID)
-+
-+#ifdef FLAG_SECTION
-+
-+    {"android-toolbar-scroll-ablation",
-+     "Android Toolbar Scroll Ablation",
-+     "Always shows the toolbar", kOsAndroid,
-+     FEATURE_VALUE_TYPE(chrome::android::kAndroidToolbarScrollAblation)},
-+
-+#endif
-+
-+#endif
--
@@ -1,759 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 18 Jun 2024 15:31:12 +0000
-Subject: Ask to restart on connection change
-
-Experimental use of the OfflineDetector to identify network change, disabled by default.
-If it is active, when the network change is detected by the android API,
-the user is warned and asked to restart the browser.
-Technically, blink's freeze mode is exploited, which allows javascript
-execution and network calls to be blocked.
-A preventive shutdown of all service workers is carried out, to inhibit the sending
-of messages over the new ip, since the service workers have access
-to the background fetch api.
-The freeze and resume event of javascript is deliberately left, since the
-page could deduct it in any case. In any case during the execution of
-the javascript events, the page can only access the FetchLater api,
-which is disabled by another patch.
-The patch also changes the standard behaviour of the browser, allowing visible pages to freeze.
-This could lead to the failure of some DCHECKS related to the handling of UI messages at unfreeze,
-but since the goal is a reboot, this should not be the case.
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- .../ConnectivityDetector.java                 |   1 -
- .../indicator/OfflineDetector.java            | 111 +++++++++++++++++-
- .../OfflineIndicatorControllerV2.java         |  15 ++-
- .../tabbed_mode/TabbedRootUiCoordinator.java  |   5 +-
- .../tabmodel/TabModelSelectorBase.java        |   7 ++
- .../sAskForRestartOnConnectionChange.java     |  32 +++++
- .../browser/tabmodel/TabModelSelector.java    |   2 +
- .../browser/tabmodel/TabModelUtils.java       |  18 +++
- .../browser/tabmodel/TabWindowManager.java    |   2 +
- .../tabmodel/TabWindowManagerImpl.java        |  10 ++
- .../Ask-for-restart-on-connection-change.grdp |   9 ++
- .../android/java/res/layout/snackbar.xml      |  10 ++
- .../ui/messages/snackbar/Snackbar.java        |  16 +++
- .../ui/messages/snackbar/SnackbarManager.java |   6 +
- .../ui/messages/snackbar/SnackbarView.java    |  13 +-
- .../web_contents/web_contents_android.cc      |  16 +++
- .../web_contents/web_contents_android.h       |   1 +
- .../browser/web_contents/web_contents_impl.cc |   2 +
- .../browser/webcontents/WebContentsImpl.java  |   8 ++
- .../content_public/browser/WebContents.java   |   2 +
- .../browser/test/mock/MockWebContents.java    |   3 +
- .../Ask-for-restart-on-connection-change.inc  |  13 ++
- .../Ask-for-restart-on-connection-change.inc  |   3 +
- .../Ask-for-restart-on-connection-change.inc  |   1 +
- .../blink/renderer/core/dom/document.cc       |   1 +
- .../blink/renderer/core/frame/local_frame.cc  |   2 +
- .../main_thread/frame_scheduler_impl.cc       |   2 +
- .../main_thread/page_scheduler_impl.cc        |   9 +-
- 28 files changed, 310 insertions(+), 10 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
- create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc
- create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Ask-for-restart-on-connection-change.inc
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
-@@ -476,7 +476,6 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
-     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-     public void setConnectionState(@ConnectionState int connectionState) {
-         Log.i(TAG, "setConnectionState connectionState=" + connectionState);
-        if (mConnectionState == connectionState) return;
-         mConnectionState = connectionState;
-         if (mObserver != null) mObserver.onConnectionStateChanged(mConnectionState);
-     }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
-@@ -21,16 +21,38 @@ import org.chromium.base.version_info.VersionInfo;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
- import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
-import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
-import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
- import org.chromium.components.variations.VariationsAssociatedData;
- 
-+import android.app.Activity;
-+import org.chromium.base.supplier.ObservableSupplier;
-+import org.chromium.url.GURL;
-+import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
-+import org.chromium.chrome.browser.layouts.LayoutManager;
-+import org.chromium.chrome.browser.compositor.layouts.Layout;
-+import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
-+import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
-+import org.chromium.chrome.browser.flags.cromite.sAskForRestartOnConnectionChange;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-+import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
-+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
-+import org.chromium.chrome.browser.tasks.tab_management.TabSwitcherLayout;
-+import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.tabmodel.TabModelUtils;
-+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-+import org.chromium.chrome.browser.tabmodel.TabWindowManager;
-+import org.chromium.chrome.browser.ApplicationLifetime;
-+import org.chromium.content_public.browser.WebContentsObserver;
-+import org.chromium.content_public.browser.WebContents;
-+import org.chromium.net.NetworkChangeNotifier;
-+
- /**
-  * Class that detects if the network is offline. Waits for the network to stablize before notifying
-  * the observer.
-  */
- class OfflineDetector
-        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener {
-+        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener,
-+                   SnackbarManager.SnackbarController, SceneChangeObserver {
-     // If the connection is online, then we report that immediately via |mIsOfflineCallback|.
-     // |STATUS_INDICATOR_WAIT_ON_OFFLINE_DURATION_MS| and
-     // |mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs| control the duration before
-@@ -116,6 +138,11 @@ class OfflineDetector
- 
-     private static final String TAG = "OfflineDetector";
- 
-+    private long mLastNetworkId = 0;
-+    private ObservableSupplier<TabModelSelector> mTabModelSelectorSupplier;
-+    private ObservableSupplier<LayoutManager> mLayoutManager;
-+    private Supplier<SnackbarManager> mSnackbarManagerSupplier;
-+
-     /**
-      * Constructs the offline indicator.
-      * @param isOfflineCallback The {@link Callback} is invoked when the connectivity status is
-@@ -127,7 +154,13 @@ class OfflineDetector
-     OfflineDetector(
-             Callback<Boolean> isOfflineCallback,
-             Callback<Boolean> isForegroundCallback,
-            Context context) {
-+            Context context,
-+            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
-+            ObservableSupplier<LayoutManager> layoutManager,
-+            Supplier<SnackbarManager> snackbarManagerSupplier) {
-+        mTabModelSelectorSupplier = tabModelSelectorSupplier;
-+        mSnackbarManagerSupplier = snackbarManagerSupplier;
-+        mLayoutManager = layoutManager;
-         mIsOfflineCallback = isOfflineCallback;
-         mIsForegroundCallback = isForegroundCallback;
-         mContext = context;
-@@ -231,6 +264,75 @@ class OfflineDetector
-         updateState();
-     }
- 
-+    private void checkLastNetworkId() {
-+        if (!sAskForRestartOnConnectionChange.getInstance().isEnabled())
-+            return;
-+
-+        long currentNetworkId = NetworkChangeNotifier.getInstance().getCurrentDefaultNetId();
-+        Log.i(TAG, "onConnectionTypeChanged: currentNetworkId=" + currentNetworkId);
-+
-+        if (currentNetworkId != -1 && mLastNetworkId != 0
-+              && mLastNetworkId != currentNetworkId) {
-+            // close snackbar with scene change
-+            LayoutManagerImpl layoutManager = (LayoutManagerImpl)mLayoutManager.get();
-+            if (layoutManager != null) layoutManager.addSceneChangeObserver(this);
-+
-+            // close snackbar with reload
-+            Tab currentTab = TabModelUtils.getCurrentTab(mTabModelSelectorSupplier.get().getCurrentModel());
-+            if (currentTab != null) {
-+                WebContents webContents = currentTab.getWebContents();
-+                SnackbarManager.SnackbarController controller = this;
-+                if (webContents != null) {
-+                    new WebContentsObserver(webContents) {
-+                        @Override
-+                        public void didStartLoading(GURL url) {
-+                            webContents.removeObserver(this);
-+                            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
-+                            snackbarManager.dismissSnackbars(controller);
-+                        }
-+                    };
-+                }
-+            }
-+
-+            // freeze all pages
-+            TabWindowManagerSingleton.getInstance().setPagesFrozen(true);
-+
-+            // show snackbar
-+            Snackbar snackbar = Snackbar.make(
-+                mContext.getString(R.string.ask_to_restart_on_connection_change_restart),
-+                /* snackbarController */ this, Snackbar.TYPE_PERSISTENT, Snackbar.UMA_UNKNOWN)
-+                .setSingleLine(false)
-+                .setAction(mContext.getString(R.string.relaunch), /*actionData*/0)
-+                .setDismissAction(mContext.getString(R.string.ask_to_restart_on_connection_change_close_notification), /*actionData*/1);
-+            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
-+            if (!snackbarManager.isShowing())
-+                snackbarManager.showSnackbar(snackbar);
-+        }
-+        mLastNetworkId = currentNetworkId;
-+    }
-+
-+    // SnackbarManager.SnackbarController
-+    @Override
-+    public void onDismissNoAction(Object actionData) {
-+        ((LayoutManagerImpl)mLayoutManager.get()).removeSceneChangeObserver(this);
-+        TabWindowManagerSingleton.getInstance().setPagesFrozen(false);
-+    }
-+
-+    @Override
-+    public void onAction(Object actionData) {
-+        if ((int)actionData == 0)
-+            ApplicationLifetime.terminate(true);
-+    }
-+
-+    // TabWindowManager.Observer
-+    @Override
-+    public void onSceneChange(Layout layout) {
-+        if (!(layout instanceof TabSwitcherLayout)) {
-+            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
-+            snackbarManager.dismissSnackbars(this);
-+        }
-+    }
-+
-     private void logToAdbConsoleNow(String prefix) {
-         Log.i(
-                 TAG,
-@@ -316,6 +418,7 @@ class OfflineDetector
-      ** Calls |mUpdateOfflineStatusIndicatorDelayedRunnable| to update the connection state.
-      */
-     private void updateState() {
-+        checkLastNetworkId();
-         mHandler.removeCallbacks(mUpdateOfflineStatusIndicatorDelayedRunnable);
- 
-         // Do not update state while the app is in background.
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
-@@ -28,6 +28,11 @@ import org.chromium.content_public.common.ContentSwitches;
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
- 
-+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;
-+
- /**
-  * Class that controls visibility and content of {@link StatusIndicatorCoordinator} to relay
-  * connectivity information.
-@@ -101,7 +106,10 @@ public class OfflineIndicatorControllerV2 {
-             Context context,
-             StatusIndicatorCoordinator statusIndicator,
-             ObservableSupplier<Boolean> isUrlBarFocusedSupplier,
-            Supplier<Boolean> canAnimateNativeBrowserControls) {
-+            Supplier<Boolean> canAnimateNativeBrowserControls,
-+            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
-+            ObservableSupplierImpl<LayoutManager> layoutManager,
-+            Supplier<SnackbarManager> snackbarManagerSupplier) {
-         if (CommandLine.getInstance()
-                 .hasSwitch(ContentSwitches.FORCE_ONLINE_CONNECTION_STATE_FOR_INDICATOR)) {
-             // If "force online connection state" switch is set, the offline indicator should never
-@@ -129,7 +137,10 @@ public class OfflineIndicatorControllerV2 {
-                     new OfflineDetector(
-                             (Boolean offline) -> onConnectionStateChanged(offline),
-                             (Boolean isForeground) -> onApplicationStateChanged(isForeground),
-                            mContext);
-+                            mContext,
-+                            tabModelSelectorSupplier,
-+                            layoutManager,
-+                            snackbarManagerSupplier);
-         }
- 
-         // Initializes the application state.
-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
-@@ -1196,7 +1196,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
-                         mActivity,
-                         mStatusIndicatorCoordinator,
-                         isUrlBarFocusedSupplier,
-                        mCanAnimateBrowserControls);
-+                        mCanAnimateBrowserControls,
-+                        mTabModelSelectorSupplier,
-+                        mLayoutManagerSupplier,
-+                        mSnackbarManagerSupplier);
-         if (mToolbarManager.getOmniboxStub() != null) {
-             mToolbarManager.getOmniboxStub().addUrlFocusChangeListener(mUrlFocusChangeListener);
-         }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-@@ -305,6 +305,13 @@ public abstract class TabModelSelectorBase
-         return null;
-     }
- 
-+    @Override
-+    public void setPagesFrozen(boolean frozen) {
-+        for (int i = 0; i < getModels().size(); i++) {
-+            TabModelUtils.setPagesFrozen(mTabModels.get(i), frozen);
-+        }
-+    }
-+
-     @Override
-     public void closeAllTabs() {
-         closeAllTabs(false);
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
-new file mode 100644
--- /dev/null
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
-@@ -0,0 +1,32 @@
-+/*
-+    This file is part of Cromite.
-+
-+    Cromite is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    Cromite is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+package org.chromium.chrome.browser.flags.cromite;
-+
-+import org.chromium.base.cached_flags.CachedFlag;
-+import org.chromium.chrome.browser.flags.ChromeFeatureMap;
-+
-+public class sAskForRestartOnConnectionChange {
-+    private static final CachedFlag sInstance =
-+        new CachedFlag(ChromeFeatureMap.getInstance(), "AskForRestartOnConnectionChange", false);
-+
-+    private sAskForRestartOnConnectionChange() {}
-+
-+    public static CachedFlag getInstance() {
-+        return sInstance;
-+    }
-+}
-diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
-+++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
-@@ -121,6 +121,8 @@ public interface TabModelSelector {
-     /** Close all tabs across all tab models */
-     void closeAllTabs();
- 
-+    void setPagesFrozen(boolean frozen);
-+
-     /**
-      * Close all tabs across all tab models
-      * @param uponExit true iff the tabs are being closed upon application exit (after user presses
-diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
-+++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
-@@ -13,10 +13,14 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabSelectionType;
- import org.chromium.content_public.browser.WebContents;
-+import org.chromium.content_public.browser.Visibility;
- import org.chromium.ui.base.WindowAndroid;
- 
- import java.util.ArrayList;
- import java.util.List;
-+import java.util.Collections;
-+import java.util.stream.IntStream;
-+import java.util.stream.Collectors;
- 
- /**
-  * A set of convenience methods used for interacting with {@link TabList}s and {@link TabModel}s.
-@@ -79,6 +83,20 @@ public class TabModelUtils {
-         return TabModel.INVALID_TAB_INDEX;
-     }
- 
-+    public static void setPagesFrozen(TabList model, boolean frozen) {
-+        List<Integer> loop = IntStream.range(0, model.getCount())
-+                                      .boxed()
-+                                      .collect(Collectors.toList());
-+        Collections.shuffle(loop);
-+        loop.forEach(tabId -> {
-+            Tab tab = model.getTabAt(tabId);
-+            WebContents webContents = tab.getWebContents();
-+            if (webContents != null) {
-+                webContents.setPageFrozen(frozen);
-+            }
-+        });
-+    }
-+
-     /**
-      * Find the {@link Tab} with the specified id.
-      *
-diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
-+++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
-@@ -100,6 +100,8 @@ public interface TabWindowManager {
-      */
-     int getIncognitoTabCount();
- 
-+    void setPagesFrozen(boolean frozen);
-+
-     /**
-      * @param tab The tab to look for in each model.
-      * @return The TabModel containing the given Tab or null if one doesn't exist.
-diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
--- a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
-+++ b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
-@@ -449,6 +449,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
-         return null;
-     }
- 
-+    @Override
-+    public void setPagesFrozen(boolean frozen) {
-+        for (int i = 0; i < mSelectors.size(); i++) {
-+            TabModelSelector selector = mSelectors.get(i);
-+            if (selector != null) {
-+                selector.setPagesFrozen(frozen);
-+            }
-+        }
-+    }
-+
-     @Override
-     public TabModelSelector getTabModelSelectorById(int index) {
-         return mSelectors.get(index);
-diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
-new file mode 100644
--- /dev/null
-+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<grit-part>
-+    <message name="IDS_ASK_TO_RESTART_ON_CONNECTION_CHANGE_RESTART" desc="">
-+        Connection to internet has changed, execution is paused. Restart Cromite?
-+    </message>
-+    <message name="IDS_ASK_TO_RESTART_ON_CONNECTION_CHANGE_CLOSE_NOTIFICATION" desc="">
-+        Not now
-+    </message>
-+</grit-part>
-diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
--- a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
-+++ b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
-@@ -82,5 +82,15 @@ found in the LICENSE file.
-             android:paddingEnd="24dp"
-             android:paddingStart="24dp"
-             style="@style/TextButton" />
-+
-+        <org.chromium.ui.widget.ButtonCompat
-+            android:id="@+id/snackbar_dismiss"
-+            android:layout_width="wrap_content"
-+            android:layout_height="wrap_content"
-+            android:layout_gravity="center_vertical"
-+            android:paddingEnd="24dp"
-+            android:paddingStart="24dp"
-+            android:visibility="gone"
-+            style="@style/TextButton" />
-     </LinearLayout>
- </RelativeLayout>
-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
-@@ -127,6 +127,8 @@ public class Snackbar {
-     private String mTemplateText;
-     private String mActionText;
-     private Object mActionData;
-+    private String mDismissActionText;
-+    private Object mDismissActionData;
-     private String mAccessibilityActionAnnouncement;
-     private int mBackgroundColor;
-     private int mTextApperanceResId;
-@@ -195,6 +197,20 @@ public class Snackbar {
-         return this;
-     }
- 
-+    public Snackbar setDismissAction(String actionText, Object actionData) {
-+        mDismissActionText = actionText;
-+        mDismissActionData = actionData;
-+        return this;
-+    }
-+
-+    public String getDismissActionText() {
-+        return mDismissActionText;
-+    }
-+
-+    Object getDismissActionData() {
-+        return mDismissActionData;
-+    }
-+
-     /**
-      * Sets the text to accessibility announce when the action button is pressed.
-      * @param accessibilityActionAnnouncement An optional string to be announced when the action
-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
-@@ -285,6 +285,12 @@ public class SnackbarManager
-                         new SnackbarView(
-                                 mActivity,
-                                 this,
-+                                new View.OnClickListener() {
-+                                    @Override
-+                                    public void onClick(View v) {
-+                                        dismissSnackbars(currentSnackbar.getController());
-+                                    }
-+                                },
-                                 currentSnackbar,
-                                 mSnackbarParentView,
-                                 mWindowAndroid,
-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
-@@ -52,6 +52,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
-     protected final ViewGroup mSnackbarView;
-     protected final TemplatePreservingTextView mMessageView;
-     private final TextView mActionButtonView;
-+    private final TextView mDismissButtonView;
-     private final ImageView mProfileImageView;
-     private final int mAnimationDuration;
-     private final boolean mIsTablet;
-@@ -98,11 +99,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
-     public SnackbarView(
-             Activity activity,
-             OnClickListener listener,
-+            OnClickListener dismissListener,
-             Snackbar snackbar,
-             ViewGroup parentView,
-             @Nullable WindowAndroid windowAndroid,
-             boolean isTablet) {
-        this(activity, listener, snackbar, parentView, windowAndroid, null, isTablet);
-+        this(activity, listener, dismissListener, snackbar, parentView, windowAndroid, null, isTablet);
-     }
- 
-     /**
-@@ -121,6 +123,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
-     public SnackbarView(
-             Activity activity,
-             OnClickListener listener,
-+            OnClickListener dismissListener,
-             Snackbar snackbar,
-             ViewGroup parentView,
-             @Nullable WindowAndroid windowAndroid,
-@@ -142,6 +145,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
-                 (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
-         mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
-         mActionButtonView.setOnClickListener(listener);
-+        mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss);
-+        mDismissButtonView.setOnClickListener(dismissListener);
-         mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
-         mEdgeToEdgeSupplier = edgeToEdgeSupplier;
-         mEdgeToEdgePadAdjuster =
-@@ -374,6 +379,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
-             mActionButtonView.setVisibility(View.VISIBLE);
-             mActionButtonView.setContentDescription(snackbar.getActionText());
-             setViewText(mActionButtonView, snackbar.getActionText(), animate);
-+            String dismissActionText = snackbar.getDismissActionText();
-+            if (dismissActionText != null) {
-+                mDismissButtonView.setVisibility(View.VISIBLE);
-+                mDismissButtonView.setContentDescription(dismissActionText);
-+                setViewText(mDismissButtonView, dismissActionText, animate);
-+            }
-             // Set the end margin on the message view to 0 when there is action text.
-             if (mMessageView.getLayoutParams() instanceof LayoutParams) {
-                 LayoutParams lp = (LayoutParams) mMessageView.getLayoutParams();
-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
-@@ -890,6 +890,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
-   view->SetFocus(focused);
- }
- 
-+void WebContentsAndroid::SetPageFrozen(JNIEnv* env, jboolean frozen) {
-+  // shutdown service workers
-+  BrowserContext* browser_context =
-+      web_contents_->GetBrowserContext();
-+  browser_context->ForEachLoadedStoragePartition(
-+      [](StoragePartition* partition) {
-+        scoped_refptr<ServiceWorkerContextWrapper> context =
-+            static_cast<ServiceWorkerContextWrapper*>(
-+                partition->GetServiceWorkerContext());
-+        context->Shutdown();
-+      });
-+
-+  SuspendAllMediaPlayers(env);
-+  web_contents_->SetPageFrozen(frozen);
-+}
-+
- bool WebContentsAndroid::IsBeingDestroyed(JNIEnv* env) {
-   return web_contents_->IsBeingDestroyed();
- }
-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
-@@ -195,6 +195,7 @@ class CONTENT_EXPORT WebContentsAndroid {
- 
-   void OnScaleFactorChanged(JNIEnv* env);
-   void SetFocus(JNIEnv* env, jboolean focused);
-+  void SetPageFrozen(JNIEnv* env, jboolean frozen);
-   bool IsBeingDestroyed(JNIEnv* env);
- 
-   void SetDisplayCutoutSafeArea(JNIEnv* env,
-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
-@@ -3532,8 +3532,10 @@ void WebContentsImpl::Stop() {
- void WebContentsImpl::SetPageFrozen(bool frozen) {
-   TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
- 
-+#if !BUILDFLAG(IS_ANDROID)
-   // A visible page is never frozen.
-   DCHECK_NE(Visibility::VISIBLE, GetVisibility());
-+#endif
- 
-   primary_frame_tree_.ForEachRenderViewHost(
-       [&frozen](RenderViewHostImpl* rvh) { rvh->SetIsFrozen(frozen); });
-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
-@@ -1169,6 +1169,12 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
-         WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
-     }
- 
-+    @Override
-+    public void setPageFrozen(boolean frozen) {
-+        if (mNativeWebContentsAndroid == 0) return;
-+        WebContentsImplJni.get().setPageFrozen(mNativeWebContentsAndroid, frozen);
-+    }
-+
-     @Override
-     public void setDisplayCutoutSafeArea(Rect insets) {
-         if (mNativeWebContentsAndroid == 0) return;
-@@ -1444,6 +1450,8 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
- 
-         void setFocus(long nativeWebContentsAndroid, boolean focused);
- 
-+        void setPageFrozen(long nativeWebContentsAndroid, boolean frozen);
-+
-         void setDisplayCutoutSafeArea(
-                 long nativeWebContentsAndroid, int top, int left, int bottom, int right);
- 
-diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
--- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
-+++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
-@@ -293,6 +293,8 @@ public interface WebContents extends Parcelable {
-      */
-     void setFocus(boolean hasFocus);
- 
-+    void setPageFrozen(boolean frozen);
-+
-     /**
-      * @return true if the renderer is in fullscreen mode.
-      */
-diff --git a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
--- a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
-+++ b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
-@@ -199,6 +199,9 @@ public class MockWebContents implements WebContents {
-     @Override
-     public void setFocus(boolean hasFocus) {}
- 
-+    @Override
-+    public void setPageFrozen(boolean frozen) {}
-+
-     @Override
-     public boolean isFullscreenForCurrentTab() {
-         return false;
-diff --git a/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc b/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
-@@ -0,0 +1,13 @@
-+#ifdef FLAG_SECTION
-+
-+#if BUILDFLAG(IS_ANDROID)
-+
-+    {"ask-for-restart-on-connection-change",
-+     "Restart on connection change",
-+     "Asks the user whether to restart the browser when the connection changes.",
-+     kOsAndroid,
-+     FEATURE_VALUE_TYPE(chrome::android::kAskForRestartOnConnectionChange)},
-+
-+#endif
-+
-+#endif
-diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc
-@@ -0,0 +1,3 @@
-+CROMITE_FEATURE(kAskForRestartOnConnectionChange,
-+                "AskForRestartOnConnectionChange",
-+                base::FEATURE_DISABLED_BY_DEFAULT);
-diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Ask-for-restart-on-connection-change.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Ask-for-restart-on-connection-change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/Ask-for-restart-on-connection-change.inc
-@@ -0,0 +1 @@
-+BASE_DECLARE_FEATURE(kAskForRestartOnConnectionChange);
-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
-@@ -4331,6 +4331,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
- }
- 
- void Document::DispatchFreezeEvent() {
-+  DLOG(INFO) << "---Document::DispatchFreezeEvent";
-   SetFreezingInProgress(true);
-   DispatchEvent(*Event::Create(event_type_names::kFreeze));
-   SetFreezingInProgress(false);
-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
-@@ -3172,6 +3172,7 @@ void LocalFrame::DidFreeze() {
-   LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
-   GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
-   Loader().SetDefersLoading(freeze_mode);
-+  DLOG(INFO) << "---LocalFrame::DidFreeze end " << (int)freeze_mode;
- }
- 
- void LocalFrame::DidResume() {
-@@ -3186,6 +3187,7 @@ void LocalFrame::DidResume() {
-   GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
-   Loader().SetDefersLoading(LoaderFreezeMode::kNone);
- 
-+  DLOG(INFO) << "---LocalFrame::DidResume";
-   GetDocument()->DispatchEvent(*Event::Create(event_type_names::kResume));
-   // TODO(fmeawad): Move the following logic to the page once we have a
-   // PageResourceCoordinator in Blink
-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
-@@ -967,7 +967,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
-   if (!parent_page_scheduler_)
-     return SchedulingLifecycleState::kNotThrottled;
-   if (parent_page_scheduler_->IsFrozen()) {
-+#if !BUILDFLAG(IS_ANDROID)
-     DCHECK(!parent_page_scheduler_->IsPageVisible());
-+#endif
-     return SchedulingLifecycleState::kStopped;
-   }
-   if (subresource_loading_paused_ && type == ObserverType::kLoader)
-diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
--- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-+++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-@@ -238,10 +238,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
-   // 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.
-+#if !BUILDFLAG(IS_ANDROID)
-   if (frozen && IsPageVisible()) {
-     DCHECK(false);
-     return;
-   }
-+#endif
-   PolicyUpdater policy_updater;
-   SetPageFrozenImpl(frozen, policy_updater);
- }
-@@ -799,7 +801,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.
-  return !IsPageVisible() && !IsAudioPlaying() &&
-+#if BUILDFLAG(IS_ANDROID)
-+  bool page_visible = true;
-+#else
-+  bool page_visible = IsPageVisible();
-+#endif
-+  return !page_visible && !IsAudioPlaying() &&
-          !main_thread_scheduler_->IsVirtualTimeEnabled();
- }
- 
--
@@ -87,9 +87,9 @@ 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
-@@ -12,6 +12,7 @@
+@@ -11,6 +11,7 @@
+ #include "services/metrics/public/cpp/ukm_recorder.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
- #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/mediastream/media_devices.h"
 +#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
@@ -134,11 +134,11 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 +
 void BaseAudioContext::NotifySourceNodeStartedProcessing(AudioNode* node) {
   DCHECK(IsMainThread());
-   DeferredTaskHandler::GraphAutoLocker locker(this);
+   GraphAutoLocker locker(this);
 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
-@@ -341,6 +341,8 @@ class MODULES_EXPORT BaseAudioContext
+@@ -339,6 +339,8 @@ class MODULES_EXPORT BaseAudioContext
   // if the execution context does not exist.
   bool CheckExecutionContextAndThrowIfNecessary(ExceptionState&);
 
@@ -150,7 +150,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
-@@ -369,6 +369,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -368,6 +368,7 @@ void OfflineAudioContext::FireCompletionEvent() {
     if (!rendered_buffer) {
       return;
     }
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -80,46 +80,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
+@@ -80,46 +80,28 @@ ScriptPromiseTyped<BatteryManager> BatteryManager::StartRequest(
 }
 
 bool BatteryManager::charging() {
@@ -7,7 +7,7 @@ This approach is not comprehensive, see also:

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../execution_context/execution_context.cc    | 15 +++++++++
+ .../execution_context/execution_context.cc    | 16 ++++++++++
 .../execution_context/execution_context.h     |  1 +
 .../renderer/core/loader/base_fetch_context.h |  1 +
 .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
@@ -19,12 +19,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../websockets/websocket_channel_impl.cc      |  5 +++
 .../modules/websockets/websocket_common.cc    | 30 ++++++++++++++++++
 .../modules/websockets/websocket_common.h     |  4 +++
- 12 files changed, 132 insertions(+), 2 deletions(-)
+ 12 files changed, 133 insertions(+), 2 deletions(-)

 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -709,6 +709,21 @@ void ExecutionContext::WriteIntoTrace(
+@@ -701,6 +701,22 @@ void ExecutionContext::WriteIntoTrace(
   proto->set_world_type(GetWorldType(*this));
 }
 
@@ -40,7 +40,8 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 +    case network::mojom::IPAddressSpace::kLocal:
 +      return "local";
 +  }
-+  NOTREACHED_NORETURN();
+  NOTREACHED();
+  return "public";
 +}
 +
 bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
@@ -49,7 +50,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
-@@ -391,6 +391,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
 
   HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -71,7 +72,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
-@@ -624,6 +624,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -593,6 +593,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -101,7 +102,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
-@@ -172,6 +172,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -177,6 +177,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
@@ -120,7 +121,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/scheduler/public/virtual_time_controller.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
-@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -94,6 +95,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -176,7 +177,7 @@ diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.c
 diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
-@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+@@ -101,6 +101,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
          request_url.ProtocolIsInHTTPFamily();
 }
 
@@ -207,7 +208,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 scoped_refptr<BlobDataHandle> ExtractBlobHandle(
     Request* request,
     ExceptionState& exception_state) {
-@@ -189,6 +213,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
+@@ -188,6 +212,13 @@ ScriptPromise BackgroundFetchManager::fetch(
                                  exception_state);
     }
 
@@ -239,7 +240,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
-@@ -136,9 +136,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -125,9 +125,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
     return ConnectResult::kException;
   }
 
@@ -18,16 +18,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 net/url_request/trk_protocol_handler.h        | 30 +++++++++++++++++++
 net/url_request/url_request.cc                |  8 +++++
 .../url_request_context_builder.cc            |  3 ++
+ url/url_constants.cc                          |  1 +
 url/url_constants.h                           |  1 +
 url/url_util.cc                               |  2 ++
- 13 files changed, 90 insertions(+), 1 deletion(-)
+ 14 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 net/url_request/trk_protocol_handler.cc
 create mode 100644 net/url_request/trk_protocol_handler.h

 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
   if (base::IsStringASCII(scheme) &&
       (ProfileIOData::IsHandledProtocol(scheme) ||
        base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
@@ -49,7 +50,7 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
 diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -169,6 +169,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -174,6 +174,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
       continue;
     }
 
@@ -64,7 +65,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -91,10 +91,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
+@@ -90,10 +90,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
 bool HasScheme(const std::u16string& input, const char* scheme) {
   std::string utf8_input(base::UTF16ToUTF8(input));
   url::Component view_source_scheme;
@@ -80,7 +81,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
   return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
 }
 
-@@ -582,7 +587,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -581,7 +586,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
   // For the view-source and blob schemes, we should emphasize the host of the
   // URL qualified by the view-source or blob prefix.
   if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -93,7 +94,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -575,6 +575,10 @@ GURL FixupURLInternal(const std::string& text,
+@@ -576,6 +576,10 @@ GURL FixupURLInternal(const std::string& text,
     }
   }
 
@@ -107,7 +108,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -864,6 +864,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -849,6 +849,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
   RegisterPseudoScheme(url::kJavaScriptScheme);
   RegisterPseudoScheme(kViewSourceScheme);
   RegisterPseudoScheme(kGoogleChromeScheme);
@@ -118,7 +119,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1014,6 +1014,8 @@ component("net") {
+@@ -997,6 +997,8 @@ component("net") {
     "url_request/url_request_http_job.cc",
     "url_request/url_request_http_job.h",
     "url_request/url_request_interceptor.cc",
@@ -203,7 +204,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 #include "base/synchronization/lock.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/types/pass_key.h"
-@@ -49,6 +50,7 @@
+@@ -47,6 +48,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -211,7 +212,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 namespace net {
 
-@@ -605,6 +607,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -591,6 +593,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
   // Sanity check out environment.
   DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
 
@@ -235,7 +236,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "url/url_constants.h"
-@@ -582,6 +583,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -559,6 +560,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     job_factory->SetProtocolHandler(scheme_handler.first,
                                     std::move(scheme_handler.second));
   }
@@ -244,21 +245,32 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
   protocol_handlers_.clear();
 
   context->set_job_factory(std::move(job_factory));
+diff --git a/url/url_constants.cc b/url/url_constants.cc
+--- a/url/url_constants.cc
+++ b/url/url_constants.cc
+@@ -29,6 +29,7 @@ const char16_t kDataScheme16[] = u"data";
+ const char kFileScheme[] = "file";
+ const char16_t kFileScheme16[] = u"file";
+ const char kFileSystemScheme[] = "filesystem";
+const char kTraceScheme[] = "trk";
+ const char16_t kFileSystemScheme16[] = u"filesystem";
+ const char kFtpScheme[] = "ftp";
+ const char16_t kFtpScheme16[] = u"ftp";
 diff --git a/url/url_constants.h b/url/url_constants.h
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
-@@ -36,6 +36,7 @@ inline constexpr char16_t kDataScheme16[] = u"data";
- inline constexpr char kDrivefsScheme[] = "drivefs";
- inline constexpr char kFileScheme[] = "file";
- inline constexpr char16_t kFileScheme16[] = u"file";
-+inline constexpr char kTraceScheme[] = "trk";
- inline constexpr char kFileSystemScheme[] = "filesystem";
- inline constexpr char16_t kFileSystemScheme16[] = u"filesystem";
- inline constexpr char kFtpScheme[] = "ftp";
+@@ -33,6 +33,7 @@ COMPONENT_EXPORT(URL) extern const char16_t kContentIDScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kDataScheme[];
+ COMPONENT_EXPORT(URL) extern const char16_t kDataScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kFileScheme[];
+COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
+ COMPONENT_EXPORT(URL) extern const char16_t kFileScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kFileSystemScheme[];
+ COMPONENT_EXPORT(URL) extern const char16_t kFileSystemScheme16[];
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -48,6 +48,7 @@ struct SchemeRegistry {
+@@ -47,6 +47,7 @@ struct SchemeRegistry {
   std::vector<SchemeWithType> standard_schemes = {
       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -266,7 +278,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
       // Yes, file URLs can have a hostname, so file URLs should be handled as
       // "standard". File URLs never have a port as specified by the SchemeType
       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -93,6 +94,7 @@ struct SchemeRegistry {
+@@ -92,6 +93,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -2,15 +2,31 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sat, 9 Apr 2022 23:01:55 +0200
 Subject: Bookmarks select all menu entry

-Requires: Restore-BookmarkToolbar-setCurrentFolder.patch
-
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../menu/bookmark_toolbar_menu_improved.xml    |  7 +++++++
- .../browser/bookmarks/BookmarkToolbar.java     | 18 ++++++++++++++++++
- .../android/strings/android_chrome_strings.grd |  3 +++
- 3 files changed, 28 insertions(+)
+ .../java/res/menu/bookmark_toolbar_menu.xml       |  7 +++++++
+ .../res/menu/bookmark_toolbar_menu_improved.xml   |  7 +++++++
+ .../chrome/browser/bookmarks/BookmarkToolbar.java | 15 +++++++++++++++
+ .../ui/android/strings/android_chrome_strings.grd |  3 +++
+ 4 files changed, 32 insertions(+)

+diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+--- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+@@ -23,6 +23,13 @@ found in the LICENSE file.
+             android:visible="false"
+             app:showAsAction="ifRoom"
+             app:iconTint="@color/default_icon_color_secondary_tint_list" />
+        <item
+            android:id="@+id/select_all_menu_id"
+            android:icon="@drawable/ic_done_blue"
+            android:title="@string/select_all_bookmarks"
+            android:visible="true"
+            app:showAsAction="ifRoom"
+            app:iconTint="@color/default_icon_color_tint_list" />
+         <item
+             android:id="@+id/import_menu_id"
+             android:icon="@drawable/ic_folder_blue_24dp"
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
@@ -31,7 +47,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/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -26,6 +26,8 @@ import java.util.ArrayList;
+@@ -28,6 +28,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
@@ -40,24 +56,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 /**
  * Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
  * the current context.
-@@ -189,12 +191,16 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -184,6 +186,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+ 
     void setCurrentFolder(BookmarkId folder) {
         mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
-         enableImportExportMenu();
-+        enableSelectAllMenu();
-     }
- 
-     void enableImportExportMenu() {
+        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
         getMenu().findItem(R.id.import_menu_id).setVisible(true);
         getMenu().findItem(R.id.export_menu_id).setVisible(true);
     }
-+
-+    void enableSelectAllMenu() {
-+        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
-     }
- 
-     void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -221,6 +227,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -212,6 +215,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
             mExportBookmarkRunnable.run();
             return true;
         }
@@ -75,18 +82,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         return mMenuIdClickedFunction.apply(menuItem.getItemId());
     }
 
-@@ -238,6 +255,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -234,6 +248,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
 
         getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
         getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
 +        getMenu().findItem(R.id.select_all_menu_id).setVisible(mCurrentFolder != null);
 
         // SelectableListToolbar will show/hide the entire group.
-         setEditButtonVisible(mEditButtonVisible);
+         setSearchButtonVisible(mSearchButtonVisible);
 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
-@@ -245,6 +245,9 @@ CHAR_LIMIT guidelines:
+@@ -248,6 +248,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>
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.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
-@@ -26,7 +26,7 @@ declare_args() {
+@@ -25,7 +25,7 @@ declare_args() {
   # WebView providers which declare one of a handful of package names. See
   # https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name
   # for details.
@@ -29,10 +29,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/browser_process_impl.cc        |  21 ++
 chrome/browser/browser_process_impl.h         |   2 +
 chrome/browser/chrome_browser_main.cc         |   3 +
- chrome/browser/flags/BUILD.gn                 |   3 +
+ chrome/browser/flags/BUILD.gn                 |   4 +
 .../flags/android/adblock_native_gateway.cc   |  31 ++
 .../browser/flags/AdBlockNativeGateway.java   |  30 ++
- .../net/system_network_context_manager.cc     |   4 +
+ .../net/system_network_context_manager.cc     |   8 +
 .../sessions/session_restore_android.cc       |   6 +-
 .../strings/android_chrome_strings.grd        |  14 +
 chrome/common/pref_names.h                    |   5 +
@@ -44,15 +44,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../component_updater/download_filters_task.h | 129 ++++++++
 ...ent_subresource_filter_throttle_manager.cc |  15 +
 ...tent_subresource_filter_throttle_manager.h |   2 +
- .../content/shared/browser/ruleset_service.cc |  47 ++-
- .../content/shared/browser/ruleset_service.h  |   8 +-
+ .../content/browser/ruleset_service.cc        |  42 ++-
+ .../content/browser/ruleset_service.h         |   7 +-
+ .../content/browser/ruleset_version.h         |   4 +
 .../unindexed_ruleset_stream_generator.cc     |   3 +
- .../core/browser/ruleset_version.h            |   4 +
+ .../browser/verified_ruleset_dealer.cc        |   3 +
 .../browser/subresource_filter_features.cc    | 116 +-------
- .../core/browser/verified_ruleset_dealer.cc   |   4 +
 .../core/common/indexed_ruleset.cc            |   5 +-
 .../Bromite-subresource-adblocker.inc         |   3 +
- 40 files changed, 1256 insertions(+), 127 deletions(-)
+ 40 files changed, 1254 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
@@ -68,7 +68,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
-@@ -338,6 +338,7 @@ if (current_toolchain == default_toolchain) {
+@@ -303,6 +303,7 @@ if (current_toolchain == default_toolchain) {
       "//chrome/android/modules/cablev2_authenticator/public:java",
       "//chrome/android/modules/stack_unwinder/provider:java",
       "//chrome/android/webapk/libs/client:client_java",
@@ -79,15 +79,15 @@ 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
-@@ -426,6 +426,7 @@ chrome_java_resources = [
+@@ -430,6 +430,7 @@ chrome_java_resources = [
+   "java/res/layout/account_chooser_dialog_title.xml",
   "java/res/layout/account_divider_preference.xml",
   "java/res/layout/account_management_account_row.xml",
-   "java/res/layout/app_history_filter.xml",
 +  "java/res/layout/adblock_editor.xml",
   "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",
-@@ -620,6 +621,7 @@ chrome_java_resources = [
+@@ -633,6 +634,7 @@ chrome_java_resources = [
   "java/res/xml/about_chrome_preferences.xml",
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.xml",
@@ -98,7 +98,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
-@@ -954,6 +954,8 @@ chrome_java_sources = [
+@@ -972,6 +972,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -182,7 +182,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -253,6 +253,24 @@ found in the LICENSE file.
+@@ -245,6 +245,24 @@ found in the LICENSE file.
         </item>
     </style>
 
@@ -210,7 +210,7 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -19,6 +19,10 @@ found in the LICENSE file.
+@@ -25,6 +25,10 @@ found in the LICENSE file.
     <!-- Compositor Tab Title Text -->
     <bool name="compositor_tab_title_fake_bold_text">true</bool>
 
@@ -254,9 +254,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
-@@ -83,6 +83,11 @@ found in the LICENSE file.
-         android:key="safety_hub"
-         android:order="14"
+@@ -78,6 +78,11 @@ found in the LICENSE file.
+         android:key="safety_check"
+         android:order="13"
         android:title="@string/prefs_safety_check"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
@@ -265,7 +265,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="15"
+         android:order="14"
 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
@@ -428,7 +428,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-@@ -865,7 +865,7 @@ public class TabModelImpl extends TabModelJniBridge {
+@@ -839,7 +839,7 @@ public class TabModelImpl extends TabModelJniBridge {
     protected boolean createTabWithWebContents(
             Tab parent, Profile profile, WebContents webContents) {
         return getTabCreator(profile.isOffTheRecord())
@@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -15679,6 +15679,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -15030,6 +15030,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Never show this again.
     </message>
 
@@ -469,7 +469,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 using content::BrowserThread;
 
 namespace {
-@@ -134,6 +136,8 @@ void SetBrowserStartupIsComplete() {
+@@ -132,6 +134,8 @@ void SetBrowserStartupIsComplete() {
   }
   GetAfterStartupTasks().clear();
   GetAfterStartupTasks().shrink_to_fit();
@@ -500,7 +500,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 namespace extensions {
 class EventRouterForwarder;
 }
-@@ -254,6 +259,7 @@ class BrowserProcess {
+@@ -245,6 +250,7 @@ class BrowserProcess {
 #endif
 
   virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -511,7 +511,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1197,6 +1197,27 @@ BrowserProcessImpl::component_updater() {
+@@ -1168,6 +1168,27 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -542,7 +542,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
-@@ -215,6 +215,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -209,6 +209,7 @@ class BrowserProcessImpl : public BrowserProcess,
 #endif
 
   component_updater::ComponentUpdateService* component_updater() override;
@@ -550,18 +550,18 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
   MediaFileSystemRegistry* media_file_system_registry() override;
   WebRtcLogUploader* webrtc_log_uploader() override;
   network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -420,6 +421,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -405,6 +406,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_;
 +  std::unique_ptr<adblock_updater::AdBlockUpdaterService> adblock_updater_;
 
- #if !BUILDFLAG(IS_ANDROID)
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
   // Used to create a singleton instance of SodaInstallerImpl, which can be
 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
-@@ -470,6 +470,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -446,6 +446,9 @@ StartupProfileInfo CreateInitialProfile(
   // missing code in the above test.
   CHECK(profile_info.profile) << "Cannot get default profile.";
 
@@ -598,6 +598,14 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
   deps = [
     ":jni_headers",
     "//base",
+@@ -71,6 +74,7 @@ robolectric_library("flags_junit_tests") {
+     "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java",
+     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithProcessorUnitTest.java",
+     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithoutProcessorUnitTest.java",
+    "android/java/src/org/chromium/chrome/browser/flags/AdBlockNativeGateway.java",
+   ]
+   deps = [
+     ":java",
 diff --git a/chrome/browser/flags/android/adblock_native_gateway.cc b/chrome/browser/flags/android/adblock_native_gateway.cc
 new file mode 100755
 --- /dev/null
@@ -672,11 +680,15 @@ new file mode 100755
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -642,6 +642,10 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -640,6 +640,14 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
 void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
   StubResolverConfigReader::RegisterPrefs(registry);
 
+#if BUILDFLAG(IS_ANDROID)
+  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, true);
+#else
 +  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);
+#endif
 +  registry->RegisterStringPref(prefs::kAdBlockFiltersURL,
 +    "https://www.bromite.org/filters/filters.dat");
 +
@@ -702,7 +714,7 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser
 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
-@@ -217,6 +217,20 @@ CHAR_LIMIT guidelines:
+@@ -220,6 +220,20 @@ CHAR_LIMIT guidelines:
         Advanced
       </message>
 
@@ -726,7 +738,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
-@@ -2754,6 +2754,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2653,6 +2653,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 inline constexpr char kAudioCaptureAllowedUrls[] =
     "hardware.audio_capture_allowed_urls";
 
@@ -741,7 +753,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
-@@ -368,6 +368,9 @@
+@@ -359,6 +359,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>
@@ -1099,7 +1111,7 @@ new file mode 100644
 +#include "components/component_updater/update_scheduler.h"
 +#include "url/gurl.h"
 +#include "components/component_updater/download_filters_task.h"
-+#include "components/subresource_filter/content/shared/browser/ruleset_service.h"
+#include "components/subresource_filter/content/browser/ruleset_service.h"
 +#include "services/network/public/cpp/shared_url_loader_factory.h"
 +
 +namespace adblock_updater {
@@ -1550,17 +1562,17 @@ new file mode 100644
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -17,6 +17,9 @@
- #include "base/strings/stringprintf.h"
+@@ -14,6 +14,9 @@
+ #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/traced_value.h"
 +#include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
- #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
+ #include "components/subresource_filter/content/browser/activation_state_computing_navigation_throttle.h"
+ #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
- #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
-@@ -108,6 +111,7 @@ ContentSubresourceFilterThrottleManager::
+@@ -148,6 +151,7 @@ ContentSubresourceFilterThrottleManager::
       profile_interaction_manager_(
           std::make_unique<subresource_filter::ProfileInteractionManager>(
               profile_context)),
@@ -1568,7 +1580,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
       web_contents_helper_(web_contents_helper) {}
 
 ContentSubresourceFilterThrottleManager::
-@@ -641,6 +645,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -667,6 +671,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
@@ -1598,21 +1610,21 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
   // Unowned since the throttle manager cannot outlive the Page that owns it.
   // The throttle manager is held as user data first on NavigationHandle, then
   // transferred to Page once it is created. Once the Page is created and this
-diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.cc b/components/subresource_filter/content/shared/browser/ruleset_service.cc
--- a/components/subresource_filter/content/shared/browser/ruleset_service.cc
-+++ b/components/subresource_filter/content/shared/browser/ruleset_service.cc
-@@ -52,9 +52,7 @@ namespace {
+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
+@@ -46,9 +46,7 @@ namespace {
+ 
 void RecordIndexAndWriteRulesetResult(
-     std::string_view uma_tag,
     RulesetService::IndexAndWriteRulesetResult result) {
-  base::UmaHistogramEnumeration(
-      base::StrCat({uma_tag, ".WriteRuleset.Result"}), result,
-      RulesetService::IndexAndWriteRulesetResult::MAX);
+-  UMA_HISTOGRAM_ENUMERATION(
+-      "SubresourceFilter.WriteRuleset.Result", static_cast<int>(result),
+-      static_cast<int>(RulesetService::IndexAndWriteRulesetResult::MAX));
 +  VLOG(1) << "SubresourceFilter.WriteRuleset.Result: " << static_cast<int>(result);
 }
 
 // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -235,10 +233,13 @@ RulesetService::RulesetService(
+@@ -228,10 +226,13 @@ RulesetService::RulesetService(
 RulesetService::~RulesetService() {}
 
 void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1628,7 +1640,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
   // 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
-@@ -248,13 +249,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -241,13 +242,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
   if (most_recently_indexed_version.IsCurrentFormatVersion() &&
       most_recently_indexed_version.content_version ==
           unindexed_ruleset_info.content_version) {
@@ -1645,15 +1657,11 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     return;
   }
 
-@@ -274,6 +278,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
-     const RulesetConfig& config,
+@@ -266,6 +270,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const {
+ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
     const base::FilePath& indexed_ruleset_base_dir,
     const UnindexedRulesetInfo& unindexed_ruleset_info) {
-+  IndexedRulesetVersion version =
-+    IndexAndWriteRulesetInternal(
-+        config,
-+        indexed_ruleset_base_dir,
-+        unindexed_ruleset_info);
+  IndexedRulesetVersion version = IndexAndWriteRulesetInternal(indexed_ruleset_base_dir, unindexed_ruleset_info);
 +  // cleanup temporary file when done
 +  if (unindexed_ruleset_info.delete_ruleset_path) {
 +    base::DeleteFile(unindexed_ruleset_info.ruleset_path);
@@ -1663,78 +1671,84 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 +
 +// static
 +IndexedRulesetVersion RulesetService::IndexAndWriteRulesetInternal(
-+    const RulesetConfig& config,
 +    const base::FilePath& indexed_ruleset_base_dir,
 +    const UnindexedRulesetInfo& unindexed_ruleset_info) {
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-@@ -281,6 +302,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -273,6 +289,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
       unindexed_ruleset_info);
 
   if (!unindexed_ruleset_stream_generator.ruleset_stream()) {
 +    LOG(WARNING) << "RulesetService: failed to open: " << unindexed_ruleset_info.ruleset_path;
     RecordIndexAndWriteRulesetResult(
-         config.uma_tag,
         IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET);
-@@ -295,6 +317,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+     return IndexedRulesetVersion();
+@@ -286,6 +303,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
           indexed_ruleset_base_dir, indexed_version);
 
   if (!base::CreateDirectory(indexed_ruleset_version_dir)) {
 +    LOG(WARNING) << "RulesetService: failed to create version dir: " << indexed_ruleset_version_dir;
     RecordIndexAndWriteRulesetResult(
-         config.uma_tag,
         IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR);
-@@ -303,13 +326,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+     return IndexedRulesetVersion();
+@@ -293,12 +311,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
 
   SentinelFile sentinel_file(indexed_ruleset_version_dir);
   if (sentinel_file.IsPresent()) {
 -    RecordIndexAndWriteRulesetResult(
-        config.uma_tag,
 -        IndexAndWriteRulesetResult::ABORTED_BECAUSE_SENTINEL_FILE_PRESENT);
-    return IndexedRulesetVersion(config.filter_tag);
+-    return IndexedRulesetVersion();
 +    LOG(WARNING) << "RulesetService: sentinel file is present in " << indexed_ruleset_version_dir;
   }
 
   if (!sentinel_file.Create()) {
 +    LOG(WARNING) << "RulesetService: cannot create sentinel file in " << indexed_ruleset_version_dir;
     RecordIndexAndWriteRulesetResult(
-         config.uma_tag,
         IndexAndWriteRulesetResult::FAILED_CREATING_SENTINEL_FILE);
-@@ -324,6 +345,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+     return IndexedRulesetVersion();
+@@ -311,6 +328,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+ 
   RulesetIndexer indexer;
-   if (!(*g_index_ruleset_func)(config, &unindexed_ruleset_stream_generator,
-                                &indexer)) {
+   if (!(*g_index_ruleset_func)(&unindexed_ruleset_stream_generator, &indexer)) {
 +    LOG(WARNING) << "RulesetService: failed parsing.";
     RecordIndexAndWriteRulesetResult(
-         config.uma_tag,
         IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET);
-@@ -343,8 +365,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+     return IndexedRulesetVersion();
+@@ -328,8 +346,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
       WriteRuleset(indexed_ruleset_version_dir,
                    unindexed_ruleset_info.license_path, indexer.data());
-   RecordIndexAndWriteRulesetResult(config.uma_tag, result);
+   RecordIndexAndWriteRulesetResult(result);
 -  if (result != IndexAndWriteRulesetResult::SUCCESS)
 +  if (result != IndexAndWriteRulesetResult::SUCCESS) {
 +    LOG(INFO) << "RulesetService: failed to index.";
-     return IndexedRulesetVersion(config.filter_tag);
+     return IndexedRulesetVersion();
 +  }
 +
 +  LOG(INFO) << "RulesetService: successful parsing.";
 
-   CHECK(indexed_version.IsValid(), base::NotFatalUntil::M129);
+   DCHECK(indexed_version.IsValid());
   return indexed_version;
-@@ -472,6 +498,7 @@ void RulesetService::IndexAndStoreRuleset(
+@@ -449,6 +471,7 @@ void RulesetService::IndexAndStoreRuleset(
 void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback,
                                       const IndexedRulesetVersion& version) {
-   CHECK(!result_callback.is_null(), base::NotFatalUntil::M129);
+   DCHECK(!result_callback.is_null());
 +  LOG(INFO) << "RulesetService: valid version: " << version.IsValid();
   if (!version.IsValid())
     return;
   version.SaveToPrefs(local_state_);
-diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.h b/components/subresource_filter/content/shared/browser/ruleset_service.h
--- a/components/subresource_filter/content/shared/browser/ruleset_service.h
-+++ b/components/subresource_filter/content/shared/browser/ruleset_service.h
-@@ -185,7 +185,7 @@ class RulesetService {
+@@ -461,7 +484,6 @@ void RulesetService::OpenAndPublishRuleset(
+       IndexedRulesetLocator::GetRulesetDataFilePath(
+           IndexedRulesetLocator::GetSubdirectoryPathForVersion(
+               indexed_ruleset_base_dir_, version));
+-
+   publisher_->TryOpenAndSetRulesetFile(
+       file_path, version.checksum,
+       base::BindOnce(&RulesetService::OnRulesetSet,
+diff --git a/components/subresource_filter/content/browser/ruleset_service.h b/components/subresource_filter/content/browser/ruleset_service.h
+--- a/components/subresource_filter/content/browser/ruleset_service.h
+++ b/components/subresource_filter/content/browser/ruleset_service.h
+@@ -182,7 +182,7 @@ class RulesetService {
   //
   // Virtual so that it can be mocked out in tests.
   virtual void IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1743,43 +1757,22 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 
   // Get the ruleset version associated with the current local_state_.
   IndexedRulesetVersion GetMostRecentlyIndexedVersion() const;
-@@ -221,6 +221,12 @@ class RulesetService {
+@@ -215,6 +215,11 @@ class RulesetService {
       const base::FilePath& indexed_ruleset_base_dir,
       const UnindexedRulesetInfo& unindexed_ruleset_info);
 
 +  // internal function used to wrap the temporary file deletion for unindexed rulesets
 +  static IndexedRulesetVersion IndexAndWriteRulesetInternal(
-+      const RulesetConfig& config,
 +      const base::FilePath& indexed_ruleset_base_dir,
 +      const UnindexedRulesetInfo& unindexed_ruleset_info);
 +
   // Reads the rules via the |unindexed_ruleset_stream_generator|, and indexes
   // them using |indexer|. Returns whether the entire ruleset could be parsed.
   static bool IndexRuleset(
-diff --git a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
--- a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
-+++ b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
-@@ -13,6 +13,7 @@
- #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h"
- #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
- #include "ui/base/resource/resource_bundle.h"
-+#include "base/logging.h"
- 
- namespace subresource_filter {
- 
-@@ -49,6 +50,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
- 
-   ruleset_size_ = unindexed_ruleset_file.GetLength();
- 
-+  LOG(INFO) << "Opened " << ruleset_path << " size " << ruleset_size_;
-+
-   copying_stream_ = std::make_unique<CopyingFileInputStream>(
-       std::move(unindexed_ruleset_file));
-   ruleset_stream_ =
-diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/components/subresource_filter/core/browser/ruleset_version.h
--- a/components/subresource_filter/core/browser/ruleset_version.h
-+++ b/components/subresource_filter/core/browser/ruleset_version.h
-@@ -54,6 +54,10 @@ struct UnindexedRulesetInfo {
+diff --git a/components/subresource_filter/content/browser/ruleset_version.h b/components/subresource_filter/content/browser/ruleset_version.h
+--- a/components/subresource_filter/content/browser/ruleset_version.h
+++ b/components/subresource_filter/content/browser/ruleset_version.h
+@@ -53,6 +53,10 @@ struct UnindexedRulesetInfo {
   // can be indicated not only by setting |license_path| to empty, but also by
   // setting it to any non existent path.
   base::FilePath license_path;
@@ -1790,6 +1783,39 @@ diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/comp
 };
 
 // Encapsulates the combination of the binary format version of the indexed
+diff --git a/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc b/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
+--- a/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
+++ b/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
+@@ -12,6 +12,7 @@
+ #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h"
+ #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
+ #include "ui/base/resource/resource_bundle.h"
+#include "base/logging.h"
+ 
+ namespace subresource_filter {
+ 
+@@ -46,6 +47,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
+ 
+   ruleset_size_ = unindexed_ruleset_file.GetLength();
+ 
+  LOG(INFO) << "Opened " << ruleset_path << " size " << ruleset_size_;
+
+   copying_stream_ = std::make_unique<CopyingFileInputStream>(
+       std::move(unindexed_ruleset_file));
+   ruleset_stream_ =
+diff --git a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
+--- a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
+++ b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
+@@ -38,6 +38,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
+   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
+                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
+                file->IsValid());
+
+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();
+
+   if (file->IsValid()) {
+     SetRulesetFile(file->Duplicate());
+     expected_checksum_ = expected_checksum;
 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
@@ -1941,27 +1967,6 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 
   return configs;
 }
-diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
--- a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
-+++ b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
-@@ -11,6 +11,7 @@
- #include "base/functional/bind.h"
- #include "base/functional/callback_helpers.h"
- #include "base/location.h"
-+#include "base/logging.h"
- #include "base/not_fatal_until.h"
- #include "base/notreached.h"
- #include "base/task/sequenced_task_runner.h"
-@@ -39,6 +40,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
-   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
-                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
-                file->IsValid());
-+
-+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();
-+
-   if (file->IsValid()) {
-     SetRulesetFile(file->Duplicate());
-     expected_checksum_ = expected_checksum;
 diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc
 --- a/components/subresource_filter/core/common/indexed_ruleset.cc
 +++ b/components/subresource_filter/core/common/indexed_ruleset.cc
@@ -1971,9 +1976,9 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
 #include "base/hash/hash.h"
 +#include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
- #include "base/not_fatal_until.h"
 #include "base/trace_event/trace_event.h"
-@@ -37,7 +38,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
+ #include "components/subresource_filter/core/common/first_party_origin.h"
+@@ -36,7 +37,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
   // least once.  The verifier detects a subset of the errors detected by the
   // checksum, and is unneeded once expected_checksum is consistently nonzero.
   flatbuffers::Verifier verifier(buffer.data(), buffer.size());
@@ -6,31 +6,19 @@ In site settings added ability to block all popups per site

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../tab_under_navigation_throttle.cc          |   1 +
 .../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 ++++++++++++++++++
 .../bromite_content_settings/popups.grdp      |  12 ++
- .../bromite_content_settings/popups.inc       |   8 ++
+ .../bromite_content_settings/popups.inc       |   7 ++
 .../core/browser/content_settings_registry.cc |   2 +-
- 9 files changed, 153 insertions(+), 3 deletions(-)
+ 8 files changed, 151 insertions(+), 3 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

-diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
--- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
-+++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
-@@ -72,6 +72,7 @@ void LogTabUnderAttempt(content::NavigationHandle* handle) {
- BASE_FEATURE(kBlockTabUnders,
-              "BlockTabUnders",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+SET_CROMITE_FEATURE_ENABLED(kBlockTabUnders);
- 
- // static
- std::unique_ptr<content::NavigationThrottle>
 diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
 --- a/components/blocked_content/android/popup_blocked_message_delegate.cc
 +++ b/components/blocked_content/android/popup_blocked_message_delegate.cc
@@ -251,19 +239,18 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/p
 new file mode 100644
 --- /dev/null
 +++ b/components/content_settings/core/browser/bromite_content_settings/popups.inc
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,7 @@
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::POPUPS)
 +    ->set_show_into_info_page()
 +    .set_desktop_ui()
-+    .set_is_renderer_content_setting()
 +    .set_allowed_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_ALLOWED)
 +    .set_ask_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCK_ALL)
 +    .set_blocked_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCKED);
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -134,7 +134,7 @@ void ContentSettingsRegistry::Init() {
+@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() {
            WebsiteSettingsInfo::SYNCABLE,
            /*allowlisted_primary_schemes=*/
            {kChromeUIScheme, kChromeDevToolsScheme, kExtensionScheme},
@@ -42,8 +42,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/updater/safe_manifest_parser.cc   |  1 +
 extensions/common/extension_features.cc       | 15 ++++++
 extensions/common/extension_features.h        |  4 ++
- .../definitions/developer_private.d.ts        |  2 +
- 30 files changed, 251 insertions(+), 97 deletions(-)
+ .../definitions/developer_private.d.ts        |  4 +-
+ 30 files changed, 252 insertions(+), 98 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
@@ -65,7 +65,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
-@@ -129,6 +129,12 @@
+@@ -127,6 +127,12 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -75,13 +75,13 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 +#include "components/flags_ui/feature_entry.h"
 +#include "components/flags_ui/flags_storage.h"
 +
- namespace extensions {
- 
- namespace developer = api::developer_private;
-@@ -471,9 +477,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
-   info->is_mv2_deprecation_warning_dismissed =
-       ManifestV2ExperimentManager::Get(profile)
-           ->DidUserAcknowledgeWarningGlobally();
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+ #include "components/supervised_user/core/browser/supervised_user_preferences.h"
+ #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+@@ -476,9 +482,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
+   info->can_load_unpacked =
+       ExtensionManagementFactory::GetForBrowserContext(profile)
+           ->HasAllowlistedExtension();
 +  info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
   return info;
 }
@@ -111,7 +111,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 template <>
 void BrowserContextKeyedAPIFactory<
     DeveloperPrivateAPI>::DeclareFactoryDependencies() {
-@@ -907,6 +936,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -908,6 +937,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
     ExtensionUpdater::CheckParams params;
     params.fetch_priority = DownloadFetchPriority::kForeground;
     params.install_immediately = true;
@@ -119,7 +119,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
     params.callback =
         base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
     updater->CheckNow(std::move(params));
-@@ -1047,7 +1077,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -1048,7 +1078,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
 
   const developer::ProfileConfigurationUpdate& update = params->update;
 
@@ -127,9 +127,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 +  if (update.in_developer_mode.has_value() && update.in_developer_mode) {
     Profile* profile = Profile::FromBrowserContext(browser_context());
     CHECK(profile);
-     if (supervised_user::AreExtensionsPermissionsEnabled(
-@@ -1062,6 +1092,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
-         ->MarkWarningAsAcknowledgedGlobally();
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+@@ -1060,6 +1090,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+     util::SetDeveloperModeForProfile(profile, *update.in_developer_mode);
   }
 
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
@@ -143,7 +143,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -236,6 +236,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+@@ -233,6 +233,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
   static std::unique_ptr<api::developer_private::ProfileInfo> CreateProfileInfo(
       Profile* profile);
 
@@ -156,7 +156,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -67,6 +67,7 @@
+@@ -60,6 +60,7 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/extension.h"
@@ -164,7 +164,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -225,12 +226,16 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -230,12 +231,16 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
 // there was previously stored data, or an empty string otherwise. The Set will
 // overwrite any previous login.
 std::string GetWebstoreLogin(Profile* profile) {
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
   profile->GetPrefs()->SetString(kWebstoreLogin, login);
 }
 
-@@ -240,6 +245,8 @@ void RecordWebstoreExtensionInstallResult(bool success) {
+@@ -245,6 +250,8 @@ void RecordWebstoreExtensionInstallResult(bool success) {
 
 api::webstore_private::ExtensionInstallStatus
 ConvertExtensionInstallStatusForAPI(ExtensionInstallStatus status) {
@@ -190,7 +190,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
   switch (status) {
     case kCanRequest:
       return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1165,7 +1172,8 @@ ExtensionFunction::ResponseAction
+@@ -1163,7 +1170,8 @@ ExtensionFunction::ResponseAction
 WebstorePrivateIsInIncognitoModeFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -200,7 +200,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 }
 
 WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1260,11 +1268,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1262,11 +1270,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
   request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
       recent_navigations_to_collect);
 
@@ -219,7 +219,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/extensions/cws_info_service.cc b/chrome/browser/extensions/cws_info_service.cc
 --- a/chrome/browser/extensions/cws_info_service.cc
 +++ b/chrome/browser/extensions/cws_info_service.cc
-@@ -162,6 +162,7 @@ namespace extensions {
+@@ -160,6 +160,7 @@ namespace extensions {
 BASE_FEATURE(kCWSInfoService,
              "CWSInfoService",
              base::FEATURE_ENABLED_BY_DEFAULT);
@@ -260,7 +260,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
-@@ -44,6 +44,7 @@
+@@ -43,6 +43,7 @@
 #include "extensions/browser/updater/extension_update_data.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -268,7 +268,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"
-@@ -198,6 +199,10 @@ void ExtensionUpdater::Start() {
+@@ -197,6 +198,10 @@ void ExtensionUpdater::Start() {
   DCHECK(!weak_ptr_factory_.HasWeakPtrs());
   DCHECK(registry_);
   alive_ = true;
@@ -279,7 +279,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   // Check soon, and set up the first delayed check.
   if (!g_skip_scheduled_checks_for_tests) {
     if (g_should_immediately_update)
-@@ -330,7 +335,8 @@ void ExtensionUpdater::AddToDownloader(
+@@ -329,7 +334,8 @@ void ExtensionUpdater::AddToDownloader(
     const Extension& extension = **extension_iter;
     const ExtensionId& extension_id = extension.id();
     if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -289,7 +289,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
       continue;
     }
     // An extension might be overwritten by policy, and have its update url
-@@ -344,7 +350,7 @@ void ExtensionUpdater::AddToDownloader(
+@@ -343,7 +349,7 @@ void ExtensionUpdater::AddToDownloader(
       continue;
     }
 
@@ -298,7 +298,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
       update_check_params->update_info[extension_id] = ExtensionUpdateData();
     } else if (AddExtensionToDownloader(extension, request_id,
                                         fetch_priority)) {
-@@ -382,6 +388,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
+@@ -381,6 +387,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
 }
 
 void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -311,7 +311,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   if (params.ids.empty()) {
     // Checking all extensions. Cancel pending DoCheckSoon() call if there's
     // one, as it would be redundant.
-@@ -390,7 +402,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -389,7 +401,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
 
   int request_id = next_request_id_++;
 
@@ -320,7 +320,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   if (params.ids.empty())
     NotifyStarted();
 
-@@ -462,7 +474,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -461,7 +473,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
                                      << " is not a corrupt reinstall";
         update_check_params.update_info[pending_id] = ExtensionUpdateData();
       } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {
@@ -329,7 +329,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
         continue;
       }
       // We have to mark high-priority extensions (such as policy-forced
-@@ -472,7 +484,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -471,7 +483,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();
@@ -338,7 +338,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
         update_check_params.update_info[pending_id].is_corrupt_reinstall =
             is_corrupt_reinstall;
         if (is_corrupt_reinstall) {
-@@ -493,6 +505,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -492,6 +504,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
           LOG(WARNING) << "Corrupt extension with id " << pending_id
                        << " will be reinstalled with ExtensionDownloader.";
         }
@@ -347,7 +347,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
       } else {
         InstallStageTracker::Get(profile_)->ReportFailure(
             pending_id,
-@@ -505,13 +519,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -504,13 +518,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
     AddToDownloader(&registry_->disabled_extensions(), pending_ids, request_id,
                     params.fetch_priority, &update_check_params);
     ExtensionSet remotely_disabled_extensions;
@@ -361,7 +361,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
     AddToDownloader(&remotely_disabled_extensions, pending_ids, request_id,
                     params.fetch_priority, &update_check_params);
   } else {
-@@ -519,7 +526,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -518,7 +525,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
       const Extension* extension =
           registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
       if (extension) {
@@ -370,7 +370,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
           update_check_params.update_info[id] = ExtensionUpdateData();
         } else if (AddExtensionToDownloader(*extension, request_id,
                                             params.fetch_priority)) {
-@@ -660,7 +667,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -659,7 +666,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
       file.extension_id, InstallStageTracker::Stage::INSTALLING);
   UpdatePingData(file.extension_id, ping);
 
@@ -379,7 +379,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));
-@@ -671,6 +678,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -670,6 +677,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
 
 bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                DownloadPingData* ping_data) {
@@ -387,7 +387,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));
-@@ -769,7 +777,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -768,7 +776,7 @@ bool ExtensionUpdater::CanUseUpdateService(
 void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
   std::set<int> request_ids;
 
@@ -396,7 +396,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
           << crx_file.info.path.value();
 
   // The ExtensionService is now responsible for cleaning up the temp file
-@@ -878,7 +886,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+@@ -877,7 +885,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
   InProgressCheck& request = requests_in_progress_[request_id];
   if (!request.in_progress_ids.empty() || request.awaiting_update_service)
     return;  // This request is not done yet.
@@ -408,7 +408,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
-@@ -81,6 +81,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -80,6 +80,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
     // right away.
     bool install_immediately = false;
 
@@ -417,7 +417,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.
-@@ -328,6 +330,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -327,6 +329,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
   base::TimeDelta frequency_;
   bool will_check_soon_ = false;
 
@@ -464,8 +464,8 @@ diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/r
 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
-@@ -127,6 +127,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-         value: () => loadTimeData.getBoolean('MV2DeprecationPanelDismissed'),
+@@ -122,6 +122,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+         value: () => loadTimeData.getBoolean('inDevMode'),
       },
 
 +      isExtUpdateEnabled: {
@@ -476,18 +476,18 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
       showActivityLog: {
         type: Boolean,
         value: () => loadTimeData.getBoolean('showActivityLog'),
-@@ -229,6 +234,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -223,6 +228,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+   canLoadUnpacked: boolean;
   delegate: Service;
   inDevMode: boolean;
-   isMv2DeprecationWarningDismissed: boolean;
 +  isExtUpdateEnabled: boolean;
   showActivityLog: boolean;
   enableEnhancedSiteControls: boolean;
   devModeControlledByPolicy: boolean;
-@@ -301,6 +307,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -293,6 +299,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+               profileInfo.isDeveloperModeControlledByPolicy;
+           this.inDevMode = profileInfo.inDeveloperMode;
           this.canLoadUnpacked = profileInfo.canLoadUnpacked;
-           this.isMv2DeprecationWarningDismissed =
-               profileInfo.isMv2DeprecationWarningDismissed;
 +          this.isExtUpdateEnabled = profileInfo.isExtensionAutoupdateEnabled;
         };
     service.getProfileStateChangedTarget().addListener(onProfileStateChanged);
@@ -495,7 +495,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -291,6 +291,11 @@ export class Service implements ServiceInterface {
+@@ -284,6 +284,11 @@ export class Service implements ServiceInterface {
         {inDeveloperMode: inDevMode});
   }
 
@@ -539,7 +539,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/r
 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
-@@ -25,6 +25,8 @@ export interface ToolbarDelegate {
+@@ -26,6 +26,8 @@ export interface ToolbarDelegate {
    */
   setProfileInDevMode(inDevMode: boolean): void;
 
@@ -548,7 +548,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
   /** Opens the dialog to load unpacked extensions. */
   loadUnpacked(): Promise<boolean>;
 
-@@ -71,6 +73,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -72,6 +74,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
         reflectToAttribute: true,
       },
 
@@ -562,7 +562,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
       devModeControlledByPolicy: Boolean,
       isChildAccount: Boolean,
 
-@@ -87,6 +96,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -88,6 +97,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
 
       expanded_: Boolean,
       showPackDialog_: Boolean,
@@ -570,7 +570,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
 
       /**
        * Prevents initiating update while update is in progress.
-@@ -98,6 +108,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -99,6 +109,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
   extensions: chrome.developerPrivate.ExtensionInfo[];
   delegate: ToolbarDelegate;
   inDevMode: boolean;
@@ -579,7 +579,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
   devModeControlledByPolicy: boolean;
   isChildAccount: boolean;
 
-@@ -150,6 +162,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -151,6 +163,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
         'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
   }
 
@@ -613,7 +613,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
-@@ -61,6 +61,8 @@
+@@ -58,6 +58,8 @@
 #include "chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.h"
 #endif
 
@@ -622,16 +622,16 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
 namespace extensions {
 
 namespace {
-@@ -359,6 +361,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
-       {"itemSuspiciousInstallLearnMore",
-        IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
-       {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
-+      {"toolbarExtensionUpdateEnabled", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED},
-+      {"toolbarExtensionUpdateEnabledNeedRestart", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR},
-       {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
-       {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
-       {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -431,6 +435,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -340,6 +342,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+     {"itemSuspiciousInstallLearnMore",
+      IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
+     {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
+    {"toolbarExtensionUpdateEnabled", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED},
+    {"toolbarExtensionUpdateEnabledNeedRestart", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR},
+     {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
+     {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
+     {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
+@@ -420,6 +424,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
   source->AddString("hostPermissionsLearnMoreLink",
                     chrome_extension_constants::kRuntimeHostPermissionsHelpURL);
   source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -668,18 +668,18 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
-@@ -292,6 +292,7 @@ namespace developerPrivate {
+@@ -278,6 +278,7 @@ namespace developerPrivate {
+     boolean isDeveloperModeControlledByPolicy;
     boolean isIncognitoAvailable;
     boolean isChildAccount;
-     boolean isMv2DeprecationWarningDismissed;
 +    boolean isExtensionAutoupdateEnabled;
   };
 
   // DEPRECATED: Prefer ExtensionInfo.
-@@ -352,6 +353,7 @@ namespace developerPrivate {
+@@ -335,6 +336,7 @@ namespace developerPrivate {
+ 
   dictionary ProfileConfigurationUpdate {
     boolean? inDeveloperMode;
-     boolean? isMv2DeprecationWarningDismissed;
 +    boolean? isExtensionAutoupdateEnabled;
   };
 
@@ -750,9 +750,9 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 +#include "extensions/common/extension_features.h"
+ #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_id.h"
 #include "extensions/common/extension_urls.h"
- #include "extensions/common/icons/extension_icon_set.h"
@@ -90,6 +94,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
   return warnings_list;
 }
@@ -831,7 +831,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
     return RespondNow(Error(keys::kNoExtensionError, extension_id_));
   }
-@@ -644,8 +668,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -629,8 +653,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                               ->GetDelegate();
   target_extension_id_ = target_extension_id;
   const Extension* target_extension =
@@ -841,7 +841,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_));
-@@ -709,8 +732,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -694,8 +717,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 =
@@ -851,7 +851,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                              ExtensionRegistry::EVERYTHING);
   std::string error;
   bool success = false;
-@@ -791,8 +813,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -776,8 +798,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
       management::CreateAppShortcut::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -861,7 +861,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)));
-@@ -842,8 +863,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -827,8 +848,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
       management::SetLaunchType::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -1057,7 +1057,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
 diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/browser/updater/extension_downloader.h
 --- a/extensions/browser/updater/extension_downloader.h
 +++ b/extensions/browser/updater/extension_downloader.h
-@@ -113,7 +113,6 @@ class ExtensionDownloader {
+@@ -112,7 +112,6 @@ class ExtensionDownloader {
   }
 
   void set_ping_enabled_domain(const std::string& domain) {
@@ -1099,7 +1099,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));
       });
 
@@ -1110,8 +1110,8 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
 diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
 --- a/extensions/common/extension_features.cc
 +++ b/extensions/common/extension_features.cc
-@@ -179,4 +179,19 @@ BASE_FEATURE(kUseNewServiceWorkerTaskQueue,
-              "UseNewServiceWorkerTaskQueue",
+@@ -158,4 +158,19 @@ BASE_FEATURE(kDeclarativeNetRequestResponseHeaderMatching,
+              "DeclarativeNetRequestResponseHeaderMatching",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +// Activates the auto update of extensions.
@@ -1133,9 +1133,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
-@@ -211,6 +211,10 @@ BASE_DECLARE_FEATURE(kUseItemSnippetsAPI);
- // If enabled, use the new simpler, more efficient service worker task queue.
- BASE_DECLARE_FEATURE(kUseNewServiceWorkerTaskQueue);
+@@ -200,6 +200,10 @@ BASE_DECLARE_FEATURE(kDeclarativeNetRequestSafeRuleLimits);
+ // matching condition.
+ BASE_DECLARE_FEATURE(kDeclarativeNetRequestResponseHeaderMatching);
 
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
 +
@@ -1147,18 +1147,20 @@ 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
-@@ -277,6 +277,7 @@ declare global {
+@@ -263,6 +263,7 @@ declare global {
+         isDeveloperModeControlledByPolicy: boolean;
         isIncognitoAvailable: boolean;
         isChildAccount: boolean;
-         isMv2DeprecationWarningDismissed: boolean;
 +        isExtensionAutoupdateEnabled: boolean;
       }
 
       export interface ExtensionConfigurationUpdate {
-@@ -295,6 +296,7 @@ declare global {
+@@ -277,7 +278,8 @@ declare global {
+       }
+ 
       export interface ProfileConfigurationUpdate {
-         inDeveloperMode?: boolean;
-         isMv2DeprecationWarningDismissed?: boolean;
+-        inDeveloperMode: boolean;
+        inDeveloperMode?: boolean;
 +        isExtensionAutoupdateEnabled?: boolean;
       }
 
@@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1247,6 +1247,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1179,6 +1179,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
       base::BindOnce(&NetworkContext::OnHttpCacheCleared,
                      base::Unretained(this), std::move(callback))));
 
@@ -10,20 +10,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/embedder_support/user_agent_utils.cc |  4 +---
 content/browser/client_hints/client_hints.cc    | 17 +++++++++++------
 .../loader/navigation_url_loader_impl.cc        |  5 +++++
- .../about_flags_cc/Client-hints-overrides.inc   |  9 +++++++++
 .../features_cc/Client-hints-overrides.inc      |  1 +
 .../cpp/features_cc/Client-hints-overrides.inc  |  1 +
 net/http/http_network_transaction.cc            |  1 +
 services/network/public/cpp/client_hints.cc     |  1 +
- .../blink/common/client_hints/client_hints.cc   |  6 ++++--
+ .../blink/common/client_hints/client_hints.cc   |  1 +
 .../common/client_hints/enabled_client_hints.cc |  4 +++-
 .../blink/renderer/core/frame/navigator_ua.idl  |  4 +++-
- .../renderer/core/frame/navigator_ua_data.cc    |  1 +
 .../renderer/core/frame/navigator_ua_data.idl   |  5 ++++-
 .../renderer/core/loader/base_fetch_context.cc  |  6 ++++--
- .../platform/runtime_enabled_features.json5     |  5 +++++
- 15 files changed, 54 insertions(+), 16 deletions(-)
- create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
+ .../platform/runtime_enabled_features.json5     |  4 ++++
+ 13 files changed, 40 insertions(+), 14 deletions(-)
 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

@@ -44,7 +41,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -60,6 +60,7 @@
+@@ -55,6 +55,7 @@
 #include "third_party/blink/public/common/permissions_policy/origin_with_possible_wildcards.h"
 #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -52,7 +49,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "url/origin.h"
-@@ -521,7 +522,8 @@ void AddPrefersReducedTransparencyHeader(net::HttpRequestHeaders* headers,
+@@ -516,7 +517,8 @@ void AddPrefersReducedTransparencyHeader(net::HttpRequestHeaders* headers,
                         : network::kPrefersReducedTransparencyNoPreference);
 }
 
@@ -62,7 +59,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
   return network::IsOriginPotentiallyTrustworthy(origin);
 }
 
-@@ -723,7 +725,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
+@@ -718,7 +720,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
     // value, disable them. This overwrites previous decision from UI.
     disable_due_to_custom_ua = !ua_metadata.has_value();
   }
@@ -72,7 +69,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
   if (!disable_due_to_custom_ua) {
     if (!ua_metadata.has_value())
       ua_metadata = delegate->GetUserAgentMetadata();
-@@ -905,10 +908,12 @@ void AddRequestClientHintsHeaders(
+@@ -900,10 +903,12 @@ void AddRequestClientHintsHeaders(
     AddEctHeader(headers, network_quality_tracker, url);
   }
 
@@ -92,7 +89,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1202,6 +1202,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1091,6 +1091,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
     return;
   }
 
@@ -104,20 +101,6 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow
   LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent);
 
   // Given that this is happening in the middle of navigation, there should
-diff --git a/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
-@@ -0,0 +1,9 @@
-+#ifdef FLAG_SECTION
-+
-+    {"enable-ua-client-hint",
-+     "Enable UA client hint",
-+     "Allow sending base low entropy client hints as "
-+     "UA, UAMobile and UAPlatform for compatibility", kOsAll,
-+     FEATURE_VALUE_TYPE(blink::features::kUserAgentClientHint)},
-+
-+#endif
 diff --git a/cromite_flags/content/common/features_cc/Client-hints-overrides.inc b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc
 new file mode 100644
 --- /dev/null
@@ -133,7 +116,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
-@@ -107,6 +107,7 @@ const size_t kMaxRestarts = 32;
+@@ -101,6 +101,7 @@ const size_t kMaxRestarts = 32;
 
 // Returns true when Early Hints are allowed on the given protocol.
 bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -148,36 +131,21 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ
 
 std::optional<std::vector<network::mojom::WebClientHintsType>>
 ParseClientHintsHeader(const std::string& header) {
-+  if ((true)) return std::nullopt;
+  if ((true)) return absl::nullopt;
   // Accept-CH is an sh-list of tokens; see:
   // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1
   std::optional<net::structured_headers::List> maybe_list =
 diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
 --- a/third_party/blink/common/client_hints/client_hints.cc
 +++ b/third_party/blink/common/client_hints/client_hints.cc
-@@ -14,6 +14,7 @@
- #include "base/strings/string_util.h"
- #include "services/network/public/cpp/client_hints.h"
- #include "third_party/blink/public/common/features.h"
-+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
- #include "url/origin.h"
- 
-@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+@@ -105,6 +105,7 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+ }
 
 bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
+  if ((true)) return false;
   switch (type) {
-    case network::mojom::WebClientHintsType::kSaveData:
+     case network::mojom::WebClientHintsType::kSaveData:
     case network::mojom::WebClientHintsType::kUA:
-     case network::mojom::WebClientHintsType::kUAMobile:
-     case network::mojom::WebClientHintsType::kUAPlatform:
-      return true;
-+      return RuntimeEnabledFeatures::UserAgentClientHintEnabled();
-+    case network::mojom::WebClientHintsType::kSaveData:
-+      return false;
-     default:
-       return false;
-   }
 diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc
 --- a/third_party/blink/common/client_hints/enabled_client_hints.cc
 +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc
@@ -219,17 +187,6 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 +] interface mixin NavigatorUA {
   [SecureContext] readonly attribute NavigatorUAData userAgentData;
 };
-diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
--- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-+++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -219,6 +219,7 @@ ScriptPromise<UADataValues> NavigatorUAData::getHighEntropyValues(
-   Dactyloscoper::RecordDirectSurface(
-       GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform());
- 
-+  if ((false))
-   for (const String& hint : hints) {
-     if (hint == "platformVersion") {
-       values->setPlatformVersion(platform_version_);
 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
@@ -266,7 +223,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/thir
     if (ShouldSendClientHint(policy, resource_origin, is_1p_origin,
                              WebClientHintsType::kUAArch, hints_preferences)) {
       SetHttpHeader(WebClientHintsType::kUAArch,
-@@ -667,6 +667,8 @@ bool BaseFetchContext::ShouldSendClientHint(
+@@ -652,6 +652,8 @@ bool BaseFetchContext::ShouldSendClientHint(
     bool is_1p_origin,
     network::mojom::blink::WebClientHintsType type,
     const ClientHintsPreferences& hints_preferences) const {
@@ -278,16 +235,15 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/thir
 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
-@@ -337,6 +337,11 @@
-       name: "AtomicMoveAPI",
-       status: "test",
+@@ -499,6 +499,10 @@
+       name: "ByobFetch",
+       status: "stable",
     },
 +    {
-+      name: "UserAgentClientHint",
-+      status: "stable",
-+      base_feature: "UserAgentClientHint",
+      name: "UserAgentClientHint",  // always disabled
+      status: "experimental",       // in bromite
 +    },
     {
-       name: "AttributionReporting",
-       origin_trial_feature_name: "PrivacySandboxAdsAPIs",
+       name: "CacheStorageCodeCacheHint",
+       origin_trial_feature_name: "CacheStorageCodeCacheHint",
 --
@@ -1,99 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 18 Jun 2024 14:14:06 +0000
-Subject: Close sessions on ip change
-
-Exposed a flag to change the behaviour of the network stack with regard
-to the automatic reconnection of quic connections when the connection changes.
-By default changed from automatic reconnection to close connection on ip change.
-No change in doh connections.
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- .../browser/network_session_configurator.cc        | 11 ++++-------
- .../about_flags_cc/Close-Sessions-On-Ip-Change.inc | 14 ++++++++++++++
- .../features_cc/Close-Sessions-On-Ip-Change.inc    |  5 +++++
- .../features_h/Close-Sessions-On-Ip-Change.inc     |  3 +++
- net/base/features.cc                               |  2 +-
- 5 files changed, 27 insertions(+), 8 deletions(-)
- create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
- create mode 100644 cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
- create mode 100644 cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
-
-diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
--- a/components/network_session_configurator/browser/network_session_configurator.cc
-+++ b/components/network_session_configurator/browser/network_session_configurator.cc
-@@ -219,9 +219,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
- 
- bool ShouldQuicCloseSessionsOnIpChange(
-     const VariationParameters& quic_trial_params) {
-  return base::EqualsCaseInsensitiveASCII(
-      GetVariationParam(quic_trial_params, "close_sessions_on_ip_change"),
-      "true");
-+  return base::FeatureList::IsEnabled(
-+          net::features::kCloseSessionsOnIpChange);
- }
- 
- bool ShouldQuicGoAwaySessionsOnIpChange(
-@@ -302,10 +301,8 @@ bool ShouldQuicEstimateInitialRtt(
- 
- bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
-     const VariationParameters& quic_trial_params) {
-  return GetVariationBoolParamOrFeatureSetting(
-      quic_trial_params, "migrate_sessions_on_network_change_v2",
-      base::FeatureList::IsEnabled(
-          net::features::kMigrateSessionsOnNetworkChangeV2));
-+  return base::FeatureList::IsEnabled(
-+          net::features::kMigrateSessionsOnNetworkChangeV2);
- }
- 
- bool ShouldQuicUseNewAlpsCodepoint(
-diff --git a/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc b/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
-@@ -0,0 +1,14 @@
-+#ifdef FLAG_SECTION
-+
-+    {"close-sessions-on-ip-change",
-+     "Close sessions on IP change",
-+     "Option to close QUIC sessions on an IP address change, "
-+     "when QUIC connection migration is not enabled.", kOsAll,
-+     FEATURE_VALUE_TYPE(net::features::kCloseSessionsOnIpChange)},
-+
-+    {"migrate-sessions-on-network-change-v2",
-+     "QUIC connection migration",
-+     "Enable QUIC connection migration.", kOsAll,
-+     FEATURE_VALUE_TYPE(net::features::kMigrateSessionsOnNetworkChangeV2)},
-+
-+#endif
-diff --git a/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc b/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
-@@ -0,0 +1,5 @@
-+CROMITE_FEATURE(kCloseSessionsOnIpChange,
-+                "CloseSessionsOnIpChange",
-+                base::FEATURE_ENABLED_BY_DEFAULT);
-+
-+SET_CROMITE_FEATURE_DISABLED(kMigrateSessionsOnNetworkChangeV2);
-diff --git a/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc b/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
-@@ -0,0 +1,3 @@
-+NET_EXPORT BASE_DECLARE_FEATURE(kCloseSessionsOnIpChange);
-+
-+NET_EXPORT BASE_DECLARE_FEATURE(kMigrateSessionsOnNetworkChangeV2);
-diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -436,7 +436,7 @@ const base::FeatureParam<int> kIpPrivacyDebugExperimentArm{
- // NetworkChangeNotifier::AreNetworkHandlesSupported).
- #if BUILDFLAG(IS_ANDROID)
- inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
-    base::FEATURE_ENABLED_BY_DEFAULT;
-+    base::FEATURE_DISABLED_BY_DEFAULT;
- #else   // !BUILDFLAG(IS_ANDROID)
- inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
-     base::FEATURE_DISABLED_BY_DEFAULT;
--
@@ -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
-@@ -669,6 +669,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -642,6 +642,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" ]
@@ -9,15 +9,13 @@ 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 ++
- .../tab/TabContextMenuItemDelegate.java       |   7 +-
 .../chrome/browser/ui/RootUiCoordinator.java  |   8 +-
 .../Customize-selection-popup.grdp            |  34 +++++
 .../res/xml/accessibility_preferences.xml     |  24 ++++
 .../selection/SelectActionMenuHelper.java     | 131 ++++++++++++------
 .../selection/SmartSelectionClient.java       |   4 +
- 10 files changed, 193 insertions(+), 52 deletions(-)
+ 8 files changed, 178 insertions(+), 50 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
@@ -37,7 +35,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
-@@ -756,10 +756,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -737,10 +737,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                                 @TabLaunchType int type,
                                 @TabCreationState int creationState,
                                 boolean markedForSelection) {
@@ -59,31 +57,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
                                 Toast.makeText(
                                                 ChromeTabbedActivity.this,
                                                 R.string.open_in_new_tab_toast,
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-@@ -191,12 +191,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
-         // Skip opening a new Tab if it doesn't make sense.
-         if (mTab.isClosing()) return false;
- 
-+        int tabLaunchType = TabLaunchType.FROM_LONGPRESS_FOREGROUND;
-+        boolean selectionPopupTabsForeground =
-+                    ContextUtils.getAppSharedPreferences().getBoolean(
-+                        "selection_popup_tabs_foreground", false);
-+        if (selectionPopupTabsForeground) {
-+            tabLaunchType = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
-+        }
-+
-         // Creating new Tabs asynchronously requires starting a new Activity to create the Tab,
-         // so the Tab returned will always be null.  There's no way to know synchronously
-         // whether the Tab is created, so assume it's always successful.
-         boolean success =
-                 tabCreator.createTabWithWebContents(
-                        mTab, webContents, TabLaunchType.FROM_LONGPRESS_FOREGROUND, url);
-+                        mTab, webContents, tabLaunchType, url);
- 
-         if (success) {
-             if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
@@ -95,9 +68,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 import org.chromium.base.ObserverList;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.supplier.ObservableSupplier;
-@@ -229,6 +230,13 @@ public class LayoutManagerImpl
+@@ -228,6 +229,13 @@ public class LayoutManagerImpl
+                                         && launchType != TabLaunchType.FROM_RECENT_TABS
                                         && launchType != TabLaunchType.FROM_RESTORE_TABS_UI
-                                         && launchType != TabLaunchType.FROM_SYNC_BACKGROUND
                                 || (!getTabModelSelector().isIncognitoSelected() && incognito);
 +                boolean selectionPopupTabsForeground =
 +                            ContextUtils.getAppSharedPreferences().getBoolean(
@@ -109,24 +82,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
                 float lastTapX = LocalizationUtils.isLayoutRtl() ? mHost.getWidth() * mPxToDp : 0.f;
                 float lastTapY = 0.f;
                 if (launchType != TabLaunchType.FROM_CHROME_UI) {
-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
-@@ -309,8 +309,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
-     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
-         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-         loadUrlParams.setReferrer(referrer);
-+        @TabLaunchType int type = TabLaunchType.FROM_LONGPRESS_BACKGROUND;
-+        if (ContextUtils.getAppSharedPreferences().getBoolean(
-+                "selection_popup_tabs_foreground", false)) {
-+            type = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
-+        }
-         mTabModelSelector.openNewTab(
-                loadUrlParams, TabLaunchType.FROM_LONGPRESS_BACKGROUND, mTab, isIncognito());
-+                loadUrlParams, type, mTab, isIncognito());
-     }
- 
-     @Override
 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
@@ -138,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 import org.chromium.base.TraceEvent;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.supplier.ObservableSupplier;
-@@ -822,11 +823,16 @@ public class RootUiCoordinator
+@@ -814,11 +815,16 @@ public class RootUiCoordinator
                             TrackerFactory.getTrackerForProfile(tab.getProfile())
                                     .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
 
@@ -198,10 +153,11 @@ 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
-@@ -73,4 +73,28 @@ found in the LICENSE file.
-         android:key="disable_toolbar_swipeup"
-         android:title="@string/disable_toolbar_swipe_up" />
- 
+@@ -63,4 +63,28 @@ found in the LICENSE file.
+         android:key="move_toolbar_bottom"
+         android:summary="@string/move_toolbar_bottom_summary"
+         android:title="@string/move_toolbar_bottom_title" />
+
 +    <PreferenceCategory
 +        android:key="customize_selecton_popup_section"
 +        android:title="@string/customize_selecton_popup_title" />
@@ -225,20 +181,19 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 +        android:key="selection_popup_smart_text"
 +        android:summary="@string/selection_popup_smart_text_summary"
 +        android:title="@string/selection_popup_smart_text_title" />
-+
 </PreferenceScreen>
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -28,6 +28,7 @@ import androidx.core.content.ContextCompat;
- import org.chromium.base.ApiCompatibilityUtils;
+@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
+ 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.PackageManagerUtils;
 import org.chromium.base.StrictModeContext;
 import org.chromium.content.R;
-@@ -53,38 +54,84 @@ import java.util.TreeSet;
+@@ -51,38 +52,84 @@ import java.util.TreeSet;
 public class SelectActionMenuHelper {
     private static final String TAG = "SelectActionMenu"; // 20 char limit.
 
@@ -353,7 +308,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
     }
 
     @Retention(RetentionPolicy.SOURCE)
-@@ -161,7 +208,7 @@ public class SelectActionMenuHelper {
+@@ -159,7 +206,7 @@ public class SelectActionMenuHelper {
             if (!additionalMenuItems.isEmpty()) {
                 // Additional menu item group which comes after default menu items.
                 SelectionMenuGroup additionalItemGroup =
@@ -362,7 +317,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 additionalItemGroup.addItems(additionalMenuItems);
                 pasteMenuItems.add(additionalItemGroup);
             }
-@@ -227,7 +274,7 @@ public class SelectActionMenuHelper {
+@@ -225,7 +272,7 @@ public class SelectActionMenuHelper {
         }
         SelectionMenuGroup primaryAssistGroup =
                 new SelectionMenuGroup(
@@ -371,7 +326,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
         View.OnClickListener clickListener = null;
         if (classificationResult.onClickListener != null) {
             clickListener = classificationResult.onClickListener;
-@@ -253,7 +300,7 @@ public class SelectActionMenuHelper {
+@@ -251,7 +298,7 @@ public class SelectActionMenuHelper {
             String selectedText) {
         SelectionMenuGroup defaultGroup =
                 new SelectionMenuGroup(
@@ -380,7 +335,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
         List<SelectionMenuItem.Builder> menuItemBuilders = new ArrayList<>();
         menuItemBuilders.add(cut(delegate.canCut()));
         menuItemBuilders.add(copy(delegate.canCopy()));
-@@ -304,7 +351,7 @@ public class SelectActionMenuHelper {
+@@ -302,7 +349,7 @@ public class SelectActionMenuHelper {
         // these menu items.
         SelectionMenuGroup secondaryAssistItems =
                 new SelectionMenuGroup(
@@ -389,7 +344,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 
         // First action is reserved for primary action so start at index 1.
         final int startIndex = 1;
-@@ -337,7 +384,7 @@ public class SelectActionMenuHelper {
+@@ -335,7 +382,7 @@ public class SelectActionMenuHelper {
         SelectionMenuGroup textProcessingItems =
                 new SelectionMenuGroup(
                         R.id.select_action_menu_text_processing_items,
@@ -398,7 +353,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
         if (isSelectionPassword || intentHandler == null) {
             addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
             return textProcessingItems;
-@@ -444,7 +491,7 @@ public class SelectActionMenuHelper {
+@@ -431,7 +478,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_cut)
                 .setIconAttr(android.R.attr.actionModeCutDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
@@ -407,7 +362,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setShowAsActionFlags(
                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                 .setIsEnabled(isEnabled)
-@@ -456,7 +503,7 @@ public class SelectActionMenuHelper {
+@@ -443,7 +490,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_copy)
                 .setIconAttr(android.R.attr.actionModeCopyDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
@@ -416,7 +371,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setShowAsActionFlags(
                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                 .setIsEnabled(isEnabled)
-@@ -468,7 +515,7 @@ public class SelectActionMenuHelper {
+@@ -455,7 +502,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_paste)
                 .setIconAttr(android.R.attr.actionModePasteDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
@@ -425,7 +380,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setShowAsActionFlags(
                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                 .setIsEnabled(isEnabled)
-@@ -482,7 +529,7 @@ public class SelectActionMenuHelper {
+@@ -469,7 +516,7 @@ public class SelectActionMenuHelper {
         return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_share))
                 .setId(R.id.select_action_menu_share)
                 .setIconAttr(android.R.attr.actionModeShareDrawable)
@@ -434,7 +389,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setShowAsActionFlags(
                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                 .setIsEnabled(isEnabled)
-@@ -494,7 +541,7 @@ public class SelectActionMenuHelper {
+@@ -481,7 +528,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_select_all)
                 .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
@@ -443,7 +398,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setShowAsActionFlags(
                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                 .setIsEnabled(isEnabled)
-@@ -507,7 +554,7 @@ public class SelectActionMenuHelper {
+@@ -494,7 +541,7 @@ public class SelectActionMenuHelper {
         SelectionMenuItem.Builder builder =
                 new SelectionMenuItem.Builder(android.R.string.paste_as_plain_text)
                         .setId(R.id.select_action_menu_paste_as_plain_text)
@@ -452,7 +407,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                         .setShowAsActionFlags(
                                 MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                         .setIsEnabled(isEnabled);
-@@ -527,7 +574,7 @@ public class SelectActionMenuHelper {
+@@ -514,7 +561,7 @@ public class SelectActionMenuHelper {
         return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_web_search))
                 .setId(R.id.select_action_menu_web_search)
                 .setIconAttr(android.R.attr.actionModeWebSearchDrawable)
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3299,8 +3299,8 @@
+@@ -3110,8 +3110,8 @@
       status: "stable",
     },
     {
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -293,8 +293,17 @@ class LocationBarMediator
+@@ -289,8 +289,17 @@ class LocationBarMediator
             if (mNativeInitialized) RecordUserAction.record("FocusLocation");
             // Don't clear Omnibox if the user just pasted text to NTP Omnibox.
             if (mShouldClearOmniboxOnFocus) {
@@ -58,15 +58,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
-@@ -102,6 +103,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -99,6 +100,7 @@ public abstract class UrlBar extends AutocompleteEditText {
     private boolean mFocused;
     private boolean mAllowFocus = true;
 
 +    private boolean mPendingSelectAll;
     private boolean mPendingScroll;
-     private int mLocationBarVerticalInset;
 
-@@ -298,6 +300,27 @@ public abstract class UrlBar extends AutocompleteEditText {
+     // Captures the current intended text scroll type.
+@@ -294,6 +296,27 @@ public abstract class UrlBar extends AutocompleteEditText {
             mPendingScroll = false;
         }
         fixupTextDirection();
@@ -36,13 +36,13 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 +        android:summary="@string/enable_accessibility_summary"
 +        android:title="@string/enable_accessibility_title" />
 +
-     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
+     <org.chromium.components.browser_ui.accessibility.TextScalePreference
         android:key="text_scale"
         android:title="@string/font_size"
 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
-@@ -1079,6 +1079,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1112,6 +1112,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
             structure.setChildCount(0);
             return;
         }
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
 diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc
 --- a/components/component_updater/component_installer.cc
 +++ b/components/component_updater/component_installer.cc
-@@ -103,6 +103,7 @@ void ComponentInstaller::Register(
+@@ -99,6 +99,7 @@ void ComponentInstaller::Register(
     base::OnceClosure callback,
     const base::Version& registered_version,
     const base::Version& max_previous_product_version) {
@@ -34,7 +34,7 @@ diff --git a/components/component_updater/component_installer.cc b/components/co
 diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
 --- a/components/component_updater/component_updater_service.cc
 +++ b/components/component_updater/component_updater_service.cc
-@@ -546,7 +546,7 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
+@@ -539,7 +539,7 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
 // Register prefs required by the component update service.
 void RegisterComponentUpdateServicePrefs(PrefRegistrySimple* registry) {
   // The component updates are enabled by default, if the preference is not set.
@@ -4,34 +4,18 @@ Subject: Disable Compose feature

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/extensions/api/settings_private/prefs_util.cc | 2 ++
- components/compose/core/browser/compose_features.cc          | 2 ++
- components/compose/features.gni                              | 2 +-
- 3 files changed, 5 insertions(+), 1 deletion(-)
+ components/compose/core/browser/compose_features.cc | 3 +++
+ components/compose/features.gni                     | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)

-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
-@@ -487,10 +487,12 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
-   (*s_allowlist)
-       [::permissions::prefs::kUnusedSitePermissionsRevocationEnabled] =
-           settings_api::PrefType::kBoolean;
-+#if BUILDFLAG(ENABLE_COMPOSE)
-   (*s_allowlist)[prefs::kEnableProactiveNudge] =
-       settings_api::PrefType::kBoolean;
-   (*s_allowlist)[prefs::kProactiveNudgeDisabledSitesWithTime] =
-       settings_api::PrefType::kDictionary;
-+#endif
- 
-   // Clear browsing data settings.
-   (*s_allowlist)[browsing_data::prefs::kDeleteBrowsingHistory] =
 diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc
 --- a/components/compose/core/browser/compose_features.cc
 +++ b/components/compose/core/browser/compose_features.cc
-@@ -83,4 +83,6 @@ BASE_FEATURE(kEnableNudgeForUnspecifiedHint,
- BASE_FEATURE(kEnableAdditionalTextMetrics,
-              "EnableAdditionalTextMetrics",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -56,4 +56,7 @@ BASE_FEATURE(kComposeTextOutputAnimation,
+ BASE_FEATURE(kComposeTextSelection,
+              "ComposeTextSelection",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
 +SET_CROMITE_FEATURE_DISABLED(kComposeEligible);
 }  // namespace compose::features
@@ -42,7 +26,7 @@ diff --git a/components/compose/features.gni b/components/compose/features.gni
 
 declare_args() {
   # Whether Compose is enabled in the build.
-  enable_compose = is_mac || is_win || is_linux || is_chromeos
+-  enable_compose = is_mac || is_win || is_linux
 +  enable_compose = false
 }
 --
@@ -10,14 +10,14 @@ 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
-@@ -689,16 +689,18 @@
+@@ -651,16 +651,18 @@
       }
     },
     {
 -      name: "CompressionDictionaryTransport",
 +      name: "CompressionDictionaryTransport", // need to be disabled
       base_feature: "none",
-       origin_trial_feature_name: "CompressionDictionaryTransportV3",
+       origin_trial_feature_name: "CompressionDictionaryTransportV2",
       origin_trial_allows_third_party: true,
       public: true,
 +      status: "experimental",
@@ -1,20 +1,15 @@
 From: uazo <uazo@users.noreply.github.com>
 Date: Sat, 13 Nov 2021 09:17:06 +0000
-Subject: Disable privacy sandbox
+Subject: Disable FLoC and privacy sandbox

 Remove UI from the settings and set the flags to inactive
 Permanently removes FLoC support, disabling the download of LSH clusters,
 the marking the history navigation and the javascript API and permission policies.
-Also disable FirstPartySets and StorageAccessAPI.

 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
 ---
 .../browser/chrome_content_browser_client.cc  |  3 +++
- .../first_party_sets_navigation_throttle.cc   |  2 +-
- .../first_party_sets_policy_service.cc        |  3 ++-
- chrome/browser/prefs/browser_prefs.cc         |  2 +-
- .../privacy_sandbox_service_impl.cc           |  2 +-
 .../privacy_sandbox_settings_delegate.cc      |  1 +
 .../privacy_sandbox/privacy_sandbox_prompt.cc |  1 +
 .../history/core/browser/history_backend.cc   | 13 +------------
@@ -22,19 +17,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../privacy_sandbox_features.cc               |  4 ++++
 .../privacy_sandbox/privacy_sandbox_prefs.cc  |  4 ++--
 .../privacy_sandbox_settings_impl.cc          | 19 ++++++++++++++-----
- .../tracking_protection_prefs.cc              |  4 ++--
- .../identity_manager/account_capabilities.cc  |  2 +-
- .../features_cc/Disable-privacy-sandbox.inc   |  1 +
- .../features_cc/Disable-privacy-sandbox.inc   |  4 ++++
+ .../Disable-FLoC-and-privacy-sandbox.inc      |  1 +
 third_party/blink/common/features.cc          |  1 +
- 17 files changed, 40 insertions(+), 28 deletions(-)
- create mode 100644 cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc
- create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
+ 10 files changed, 28 insertions(+), 21 deletions(-)
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FLoC-and-privacy-sandbox.inc

 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -3339,6 +3339,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -3239,6 +3239,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -44,66 +35,10 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
   Profile* profile = Profile::FromBrowserContext(browser_context);
 
   auto* privacy_sandbox_settings =
-diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
--- a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
-+++ b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
-@@ -77,7 +77,7 @@ FirstPartySetsNavigationThrottle::MaybeCreateNavigationThrottle(
-   // The `service` might be null for some irregular profiles.
-   // TODO(crbug.com/40233408): regular profiles and guest sessions
-   // aren't mutually exclusive on ChromeOS.
-  if (!profile->IsRegularProfile() || profile->IsGuestSession())
-+  if (((true)) || !profile->IsRegularProfile() || profile->IsGuestSession())
-     return nullptr;
- 
-   FirstPartySetsPolicyService* service =
-diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
--- a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
-+++ b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
-@@ -59,6 +59,7 @@ const base::Value::Dict* GetOverridesPolicyForProfile(
- }
- 
- ServiceState GetServiceState(Profile* profile, bool pref_enabled) {
-+  if ((true)) return ServiceState::kPermanentlyDisabled;
-   if (profile->IsSystemProfile() || profile->IsGuestSession() ||
-       profile->IsOffTheRecord()) {
-     return ServiceState::kPermanentlyDisabled;
-@@ -112,7 +113,7 @@ void FirstPartySetsPolicyService::Init() {
-       profile, profile->GetPrefs() &&
-                    profile->GetPrefs()->GetBoolean(
-                        prefs::kPrivacySandboxRelatedWebsiteSetsEnabled));
-
-+  service_state_ = ServiceState::kPermanentlyDisabled;
-   if (service_state_ == ServiceState::kPermanentlyDisabled) {
-     OnReadyToNotifyDelegates(net::FirstPartySetsContextConfig(),
-                              net::FirstPartySetsCacheFilter());
-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
-@@ -1577,7 +1577,7 @@ void RegisterProfilePrefsForMigration(
-   registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());
- 
-   // Deprecated 03/2024.
-  registry->RegisterBooleanPref(kPrivacySandboxApisEnabled, true);
-+  registry->RegisterBooleanPref(kPrivacySandboxApisEnabled, false);
- 
-   // Deprecated 03/2024.
-   registry->RegisterBooleanPref(kShowInternalAccessibilityTree, false);
-diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
-+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
-@@ -471,7 +471,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
- void PrivacySandboxServiceImpl::SetFirstPartySetsDataAccessEnabled(
-     bool enabled) {
-   pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
-                            enabled);
-+                            false);
- }
- 
- bool PrivacySandboxServiceImpl::IsFirstPartySetsDataAccessEnabled() const {
 diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
-@@ -164,6 +164,7 @@ bool PrivacySandboxSettingsDelegate::HasAppropriateTopicsConsent() const {
+@@ -159,6 +159,7 @@ bool PrivacySandboxSettingsDelegate::HasAppropriateTopicsConsent() const {
 
 bool PrivacySandboxSettingsDelegate::PrivacySandboxRestrictedNoticeRequired()
     const {
@@ -147,7 +82,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
 diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
 --- a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
-@@ -502,8 +502,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
+@@ -478,8 +478,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
   if (attestations_map.has_value() &&
       (!file_version_.IsValid() || file_version_.CompareTo(version) < 0)) {
     // Parsing succeeded and the attestations file has newer version.
@@ -159,9 +94,9 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san
 diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
 --- a/components/privacy_sandbox/privacy_sandbox_features.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_features.cc
-@@ -261,4 +261,8 @@ const base::FeatureParam<bool>
-         &kPrivacySandboxLocalNoticeConfirmation, "default-to-os-country",
-         false};
+@@ -167,4 +167,8 @@ BASE_FEATURE(kTrackingProtectionNoticeRequestTracking,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_ANDROID)
 
 +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxSettings4);
 +SET_CROMITE_FEATURE_ENABLED(kDisablePrivacySandboxPrompts);
@@ -171,7 +106,16 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components
 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -24,7 +24,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -12,7 +12,7 @@ namespace privacy_sandbox {
+ 
+ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+   registry->RegisterBooleanPref(
+-      prefs::kPrivacySandboxApisEnabled, true,
+      prefs::kPrivacySandboxApisEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
+                                 false);
+@@ -27,7 +27,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kPrivacySandboxM1FledgeEnabled, false);
   registry->RegisterBooleanPref(prefs::kPrivacySandboxM1AdMeasurementEnabled,
                                 false);
@@ -180,19 +124,10 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
 
   registry->RegisterTimePref(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                              base::Time());
-@@ -48,7 +48,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kPrivacySandboxFirstPartySetsDataAccessAllowedInitialized, false);
-   registry->RegisterBooleanPref(
-      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, true,
-+      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, false,  // must be disabled
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- 
-   registry->RegisterBooleanPref(prefs::kPrivacySandboxTopicsConsentGiven,
 diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
-@@ -125,7 +125,7 @@ std::set<browsing_topics::Topic> GetTopicsSetFromString(
+@@ -123,7 +123,7 @@ std::set<browsing_topics::Topic> GetTopicsSetFromString(
 
 // static
 bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -201,7 +136,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
 }
 
 // static
-@@ -245,7 +245,8 @@ PrivacySandboxSettingsImpl::GetFinchPrioritizedTopics() {
+@@ -232,7 +232,8 @@ PrivacySandboxSettingsImpl::GetFinchPrioritizedTopics() {
   return finch_prioritized_topics_;
 }
 
@@ -211,7 +146,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   Status status = GetM1TopicAllowedStatus();
   JoinHistogram(kIsTopicsAllowedHistogram, status);
   return IsAllowed(status);
-@@ -277,7 +278,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
+@@ -264,7 +265,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
   return IsAllowed(status);
 }
 
@@ -221,7 +156,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   const auto& blocked_topics =
       pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
 
-@@ -479,6 +481,7 @@ bool PrivacySandboxSettingsImpl::
+@@ -466,6 +468,7 @@ bool PrivacySandboxSettingsImpl::
 void PrivacySandboxSettingsImpl::SetFledgeJoiningAllowed(
     const std::string& top_frame_etld_plus1,
     bool allowed) {
@@ -229,7 +164,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   ScopedDictPrefUpdate scoped_pref_update(
       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
 
-@@ -550,7 +553,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
+@@ -536,7 +539,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
 }
 
 bool PrivacySandboxSettingsImpl::IsFledgeJoiningAllowed(
@@ -239,7 +174,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   ScopedDictPrefUpdate scoped_pref_update(
       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
   auto& pref_data = scoped_pref_update.Get();
-@@ -813,7 +817,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
+@@ -782,7 +786,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
   delegate_ = std::move(delegate);
 }
 
@@ -251,7 +186,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                          base::Time::Now());
 
-@@ -826,6 +833,7 @@ PrivacySandboxSettingsImpl::Status
+@@ -795,6 +802,7 @@ PrivacySandboxSettingsImpl::Status
 PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
     const url::Origin& top_frame_origin,
     const GURL& url) const {
@@ -259,7 +194,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   // Relying on |host_content_settings_map_| instead of |cookie_settings_|
   // allows to query whether the site associated with the |url| is allowed to
   // access Site data (aka ContentSettingsType::COOKIES) without considering any
-@@ -840,6 +848,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
+@@ -809,6 +817,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
 PrivacySandboxSettingsImpl::Status
 PrivacySandboxSettingsImpl::GetPrivacySandboxAllowedStatus(
     bool should_ignore_restriction /*=false*/) const {
@@ -267,58 +202,17 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   if (delegate_->IsIncognitoProfile()) {
     return Status::kIncognitoProfile;
   }
-diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc
--- a/components/privacy_sandbox/tracking_protection_prefs.cc
-+++ b/components/privacy_sandbox/tracking_protection_prefs.cc
-@@ -53,14 +53,14 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
- 
-   // Tracking Protection Settings Prefs
-   registry->RegisterBooleanPref(
-      prefs::kBlockAll3pcToggleEnabled, false,
-+      prefs::kBlockAll3pcToggleEnabled, false, // with true enables FPS
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(prefs::kAllowAll3pcToggleEnabled, false);
-   registry->RegisterIntegerPref(
-       prefs::kTrackingProtectionLevel,
-       static_cast<int>(TrackingProtectionLevel::kStandard),
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false);
-+  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false); // with true enables FPS
-   registry->RegisterBooleanPref(
-       prefs::kIpProtectionEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-diff --git a/components/signin/public/identity_manager/account_capabilities.cc b/components/signin/public/identity_manager/account_capabilities.cc
--- a/components/signin/public/identity_manager/account_capabilities.cc
-+++ b/components/signin/public/identity_manager/account_capabilities.cc
-@@ -82,7 +82,7 @@ signin::Tribool AccountCapabilities::
- 
- signin::Tribool AccountCapabilities::can_run_chrome_privacy_sandbox_trials()
-     const {
-  return GetCapabilityByName(kCanRunChromePrivacySandboxTrialsCapabilityName);
-+  return signin::Tribool::kFalse;
- }
- 
- signin::Tribool AccountCapabilities::is_opted_in_to_parental_supervision()
-diff --git a/cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FLoC-and-privacy-sandbox.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FLoC-and-privacy-sandbox.inc
 new file mode 100644
 --- /dev/null
-+++ b/cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-FLoC-and-privacy-sandbox.inc
@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIsM1Override);
-diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
-@@ -0,0 +1,4 @@
 +SET_CROMITE_FEATURE_DISABLED(kFencedFrames);
-+SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPI);
-+SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPIM118);
-+SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPIM125);
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2601,6 +2601,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
- // constants for features in the section above.
+@@ -2462,6 +2462,7 @@ bool IsAllowPageWithIDBConnectionAndTransactionInBFCacheEnabled() {
+ }
 
 bool IsAllowURNsInIframeEnabled() {
 +  if ((true)) return false; // see https://chromium-review.googlesource.com/c/chromium/src/+/3690741
@@ -5,11 +5,9 @@ Subject: Disable FedCm
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
- .../third_party/blink/common/features_cc/Disable-FedCm.inc      | 1 +
 .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
- create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc

 diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 new file mode 100644
@@ -17,16 +15,10 @@ new file mode 100644
 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kFedCm);
-diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kFedCmWithStorageAccessAPI);
 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
-@@ -1526,7 +1526,7 @@
+@@ -1570,7 +1570,7 @@
     {
       name: "FedCm",
       public: true,
@@ -0,0 +1,89 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 2 May 2023 15:26:46 +0000
+Subject: Disable FirstPartySets and StorageAccessAPI
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../first_party_sets/first_party_sets_navigation_throttle.cc  | 2 +-
+ .../first_party_sets/first_party_sets_policy_service.cc       | 3 ++-
+ .../browser/privacy_sandbox/privacy_sandbox_service_impl.cc   | 2 +-
+ components/privacy_sandbox/privacy_sandbox_prefs.cc           | 2 +-
+ components/privacy_sandbox/tracking_protection_prefs.cc       | 4 ++--
+ 5 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
+--- a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
+++ b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
+@@ -77,7 +77,7 @@ FirstPartySetsNavigationThrottle::MaybeCreateNavigationThrottle(
+   // The `service` might be null for some irregular profiles.
+   // TODO(https://crbug.com/1348572): regular profiles and guest sessions
+   // aren't mutually exclusive on ChromeOS.
+-  if (!profile->IsRegularProfile() || profile->IsGuestSession())
+  if (((true)) || !profile->IsRegularProfile() || profile->IsGuestSession())
+     return nullptr;
+ 
+   FirstPartySetsPolicyService* service =
+diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
+--- a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
+++ b/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
+@@ -58,6 +58,7 @@ const base::Value::Dict* GetOverridesPolicyForProfile(
+ }
+ 
+ ServiceState GetServiceState(Profile* profile, bool pref_enabled) {
+  if ((true)) return ServiceState::kPermanentlyDisabled;
+   if (profile->IsSystemProfile() || profile->IsGuestSession() ||
+       profile->IsOffTheRecord()) {
+     return ServiceState::kPermanentlyDisabled;
+@@ -107,7 +108,7 @@ void FirstPartySetsPolicyService::Init() {
+       profile, profile->GetPrefs() &&
+                    profile->GetPrefs()->GetBoolean(
+                        prefs::kPrivacySandboxRelatedWebsiteSetsEnabled));
+-
+  service_state_ = ServiceState::kPermanentlyDisabled;
+   if (service_state_ == ServiceState::kPermanentlyDisabled) {
+     OnReadyToNotifyDelegates(net::FirstPartySetsContextConfig(),
+                              net::FirstPartySetsCacheFilter());
+diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
+--- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
+@@ -418,7 +418,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
+ void PrivacySandboxServiceImpl::SetFirstPartySetsDataAccessEnabled(
+     bool enabled) {
+   pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
+-                            enabled);
+                            false);
+ }
+ 
+ bool PrivacySandboxServiceImpl::IsFirstPartySetsDataAccessEnabled() const {
+diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
+--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
+@@ -51,7 +51,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kPrivacySandboxFirstPartySetsDataAccessAllowedInitialized, false);
+   registry->RegisterBooleanPref(
+-      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, true,
+      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, false,  // must be disabled
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ 
+   registry->RegisterBooleanPref(prefs::kPrivacySandboxTopicsConsentGiven,
+diff --git a/components/privacy_sandbox/tracking_protection_prefs.cc b/components/privacy_sandbox/tracking_protection_prefs.cc
+--- a/components/privacy_sandbox/tracking_protection_prefs.cc
+++ b/components/privacy_sandbox/tracking_protection_prefs.cc
+@@ -64,13 +64,13 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+ 
+   // Tracking Protection Settings Prefs
+   registry->RegisterBooleanPref(
+-      prefs::kBlockAll3pcToggleEnabled, false,
+      prefs::kBlockAll3pcToggleEnabled, false, // with true enables FPS
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterIntegerPref(
+       prefs::kTrackingProtectionLevel,
+       static_cast<int>(TrackingProtectionLevel::kStandard),
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+-  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false);
+  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false); // with true enables FPS
+   registry->RegisterBooleanPref(
+       prefs::kIpProtectionEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+--
@@ -4,12 +4,11 @@ Subject: Disable GSA by default

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../chrome/browser/IntentHandler.java         |  5 -----
- .../chrome/browser/share/LensUtils.java       | 14 ++------------
- .../chromium/chrome/browser/gsa/GSAState.java | 14 +++++---------
- .../GoogleBottomBarActionsHandler.java        | 19 ++-----------------
- .../Disable-GSA-by-default.inc                |  1 +
- 5 files changed, 10 insertions(+), 43 deletions(-)
+ .../org/chromium/chrome/browser/IntentHandler.java |  5 -----
+ .../chromium/chrome/browser/share/LensUtils.java   | 14 ++------------
+ .../org/chromium/chrome/browser/gsa/GSAState.java  | 11 +++++------
+ .../Disable-GSA-by-default.inc                     |  1 +
+ 4 files changed, 8 insertions(+), 23 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -20,10 +19,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 -import org.chromium.chrome.browser.gsa.GSAState;
- import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
+ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -258,8 +257,6 @@ public class IntentHandler {
+@@ -244,8 +243,6 @@ public class IntentHandler {
     private static int sReferrerId;
     private static String sPendingIncognitoUrl;
 
@@ -32,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
     private static final String PACKAGE_GMAIL = "com.google.android.gm";
     private static final String PACKAGE_PLUS = "com.google.android.apps.plus";
     private static final String PACKAGE_HANGOUTS = "com.google.android.talk";
-@@ -485,8 +482,6 @@ public class IntentHandler {
+@@ -461,8 +458,6 @@ public class IntentHandler {
             return ExternalAppId.LINE;
         } else if (packageName.equals(PACKAGE_WHATSAPP)) {
             return ExternalAppId.WHATSAPP;
@@ -86,19 +85,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
 diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java
 --- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java
 +++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java
-@@ -31,11 +31,6 @@ import java.util.regex.Pattern;
+@@ -31,8 +31,6 @@ import java.util.regex.Pattern;
 
 /** A class responsible for representing the current state of Chrome's integration with GSA. */
 public class GSAState {
 -    public static final String PACKAGE_NAME = "com.google.android.googlequicksearchbox";
-    public static final String GOOGLE_APP_CLASS_NAME =
-            "com.google.android.apps.search.googleapp.activity.GoogleAppActivity";
-    public static final String VOICE_SEARCH_INTENT_ACTION = "android.intent.action.VOICE_ASSIST";
 -
     /** Used to observe state changes in the class. */
     public interface Observer {
         /** Called when the GSA account name is set. */
-@@ -72,7 +67,7 @@ public class GSAState {
+@@ -70,7 +68,7 @@ public class GSAState {
     private final ObserverList<Observer> mObserverList = new ObserverList<>();
 
     /** Caches the result of a computation on whether GSA is available. */
@@ -107,7 +103,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat
 
     /**
      * The Google account email address being used by GSA according to the latest update we have
-@@ -154,7 +149,7 @@ public class GSAState {
+@@ -152,7 +150,7 @@ public class GSAState {
 
     /** Returns whether the GSA package is installed on device. */
     public boolean isGsaInstalled() {
@@ -116,7 +112,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat
     }
 
     /**
-@@ -177,6 +172,7 @@ public class GSAState {
+@@ -175,6 +173,7 @@ public class GSAState {
      */
     public boolean isAgsaVersionBelowMinimum(
             String installedVersionName, String minimumVersionName) {
@@ -124,7 +120,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat
         if (TextUtils.isEmpty(installedVersionName) || TextUtils.isEmpty(minimumVersionName)) {
             return true;
         }
-@@ -208,7 +204,7 @@ public class GSAState {
+@@ -206,7 +205,7 @@ public class GSAState {
      * @return Whether the given intent can be handled by Agsa.
      */
     public boolean canAgsaHandleIntent(@NonNull Intent intent) {
@@ -133,7 +129,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat
 
         ComponentName activity =
                 intent.resolveActivity(ContextUtils.getApplicationContext().getPackageManager());
-@@ -222,7 +218,7 @@ public class GSAState {
+@@ -220,7 +219,7 @@ public class GSAState {
      * @return The version name of the Agsa package or null if it can't be found.
      */
     public @Nullable String getAgsaVersionName() {
@@ -142,62 +138,6 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAStat
         return packageInfo == null ? null : packageInfo.versionName;
     }
 
-diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java b/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
--- a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
-+++ b/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
-@@ -4,9 +4,6 @@
- 
- package org.chromium.chrome.browser.ui.google_bottom_bar;
- 
-import static org.chromium.chrome.browser.gsa.GSAState.GOOGLE_APP_CLASS_NAME;
-import static org.chromium.chrome.browser.gsa.GSAState.PACKAGE_NAME;
-import static org.chromium.chrome.browser.gsa.GSAState.VOICE_SEARCH_INTENT_ACTION;
- import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_HOME;
- import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_LENS;
- import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_SEARCH;
-@@ -106,11 +103,6 @@ class GoogleBottomBarActionsHandler {
-     }
- 
-     void onSearchboxMicTap() {
-        GoogleBottomBarLogger.logButtonClicked(SEARCHBOX_VOICE_SEARCH);
-        Intent intent = new Intent(VOICE_SEARCH_INTENT_ACTION);
-        intent.setPackage(PACKAGE_NAME);
-
-        startGoogleAppActivityForResult(intent, "openGoogleAppVoiceSearch");
-     }
- 
-     void onSearchboxLensTap() {
-@@ -148,21 +140,13 @@ class GoogleBottomBarActionsHandler {
-     }
- 
-     private void openGoogleAppSearch() {
-        Intent intent = new Intent(SearchManager.INTENT_ACTION_GLOBAL_SEARCH);
-        intent.setPackage(PACKAGE_NAME);
-
-        startGoogleAppActivityForResult(intent, "openGoogleAppSearch");
-     }
- 
-     private void openGoogleAppHome() {
-        Intent intent = new Intent(Intent.ACTION_MAIN);
-        intent.addCategory(Intent.CATEGORY_INFO);
-        intent.setClassName(PACKAGE_NAME, GOOGLE_APP_CLASS_NAME);
-
-        startGoogleAppActivityForResult(intent, "openGoogleAppHome");
-     }
- 
-     private void startGoogleAppActivityForResult(Intent intent, String actionName) {
-+        if ((true)) return;
-         intent.putExtra(EXTRA_IS_LAUNCHED_FROM_CHROME_SEARCH_ENTRYPOINT, true);
- 
-         if (PackageManagerUtils.canResolveActivity(intent)) {
-@@ -285,6 +269,7 @@ class GoogleBottomBarActionsHandler {
-     }
- 
-     private void sendPendingIntentWithUrl(PendingIntent pendingIntent) {
-+        if ((true)) return;
-         Tab tab = mTabProvider.get();
-         if (tab == null) {
-             Log.e(TAG, "Can't send pending intent as tab is null.");
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc
 new file mode 100644
 --- /dev/null
@@ -5,10 +5,10 @@ Subject: Disable GetInstalledRelatedApps API
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../components/installedapp/InstalledAppProviderImpl.java       | 1 +
- content/browser/installedapp/installed_app_provider_impl.cc     | 2 +-
+ content/browser/installedapp/installed_app_provider_impl_win.cc | 1 +
 .../content_features_cc/Disable-GetInstalledRelatedApps-API.inc | 2 ++
 .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 4 files changed, 5 insertions(+), 2 deletions(-)
+ 4 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc

 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
@@ -22,18 +22,17 @@ diff --git a/components/installedapp/android/java/src/org/chromium/components/in
         GURL url = mRenderFrameHost.getLastCommittedURL();
         final GURL frameUrl = url == null ? GURL.emptyGURL() : url;
         int delayMillis = 0;
-diff --git a/content/browser/installedapp/installed_app_provider_impl.cc b/content/browser/installedapp/installed_app_provider_impl.cc
--- a/content/browser/installedapp/installed_app_provider_impl.cc
-+++ b/content/browser/installedapp/installed_app_provider_impl.cc
-@@ -59,7 +59,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
-     const GURL& manifest_url,
-     FilterInstalledAppsCallback callback) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (!base::FeatureList::IsEnabled(features::kInstalledAppProvider)) {
-+  if ((true)) {
-     base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-         FROM_HERE,
-         base::BindOnce(std::move(callback),
+diff --git a/content/browser/installedapp/installed_app_provider_impl_win.cc b/content/browser/installedapp/installed_app_provider_impl_win.cc
+--- a/content/browser/installedapp/installed_app_provider_impl_win.cc
+++ b/content/browser/installedapp/installed_app_provider_impl_win.cc
+@@ -112,6 +112,7 @@ void FilterInstalledAppsForWin(
+     std::vector<blink::mojom::RelatedApplicationPtr> related_apps,
+     blink::mojom::InstalledAppProvider::FilterInstalledAppsCallback callback,
+     const GURL frame_url) {
+  CHECK(true);
+   ComPtr<ILauncherStatics4> launcher_statics;
+   HRESULT hr = base::win::RoActivateInstance(
+       base::win::ScopedHString::Create(RuntimeClass_Windows_System_Launcher)
 diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc b/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
 new file mode 100644
 --- /dev/null
@@ -44,7 +43,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
-@@ -2194,9 +2194,9 @@
+@@ -2114,9 +2114,9 @@
       status: {"Android": "test", "default": "stable"},
     },
     {
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
-@@ -113,7 +113,7 @@ public class StartupPaintPreviewHelper {
+@@ -112,7 +112,7 @@ public class StartupPaintPreviewHelper {
      * feature is not enabled this is effectively a no-op.
      */
     public static void setShouldShowOnRestore(boolean shouldShowOnRestore) {
@@ -4,17 +4,17 @@ Subject: Disable PrivacyGuide

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/xml/privacy_preferences.xml         | 1 +
- chrome/browser/ui/webui/settings/settings_ui.cc             | 3 +--
- .../common/chrome_features_cc/Disable-PrivacyGuide.inc      | 6 ++++++
- 3 files changed, 8 insertions(+), 2 deletions(-)
+ chrome/android/java/res/xml/privacy_preferences.xml      | 1 +
+ chrome/browser/ui/webui/settings/settings_ui.cc          | 2 +-
+ .../common/chrome_features_cc/Disable-PrivacyGuide.inc   | 9 +++++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -27,6 +27,7 @@ found in the LICENSE file.
-         app:isPreferenceVisible="false" />
+@@ -21,6 +21,7 @@ found in the LICENSE file.
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" />
     <Preference
         android:key="privacy_guide"
 +        app:isPreferenceVisible="false"
@@ -24,21 +24,23 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -365,8 +365,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -357,7 +357,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
 #endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
 
   bool show_privacy_guide =
-      base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) ||
-      (!chrome::ShouldDisplayManagedUi(profile) && !profile->IsChild());
+-      !chrome::ShouldDisplayManagedUi(profile) && !profile->IsChild();
 +      false;
   html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
 
-   html_source->AddBoolean(
+   html_source->AddBoolean("enablePrivacyGuide3", base::FeatureList::IsEnabled(
 diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,9 @@
+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuide3);
+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuidePreload);
+
 +#if BUILDFLAG(IS_ANDROID)
 +
 +SET_CROMITE_FEATURE_DISABLED(kPrivacyGuideAndroid3);
@@ -4,16 +4,16 @@ Subject: Disable Real Box

 Real-box is search box in ntp
 ---
- chrome/browser/prefs/browser_prefs.cc                  | 2 +-
- chrome/browser/resources/new_tab_page/app.html         | 7 -------
- chrome/browser/ui/webui/searchbox/searchbox_handler.cc | 1 +
- components/search/ntp_features.cc                      | 6 +++---
- 4 files changed, 5 insertions(+), 11 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc              | 2 +-
+ chrome/browser/resources/new_tab_page/app.html     | 5 -----
+ chrome/browser/ui/webui/realbox/realbox_handler.cc | 2 +-
+ components/search/ntp_features.cc                  | 6 +++---
+ 4 files changed, 5 insertions(+), 10 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
-@@ -2350,7 +2350,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2072,7 +2072,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   registry->RegisterBooleanPref(
       prefs::kLensRegionSearchEnabled, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,35 +25,34 @@ 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
-@@ -440,13 +440,6 @@
+@@ -504,11 +504,6 @@
       hidden$="[[!logoEnabled_]]">
   </ntp-logo>
   <div id="realboxContainer">
-    <cr-realbox id="realbox" is-dark="[[theme_.isDark]]"
+-    <ntp-realbox id="realbox" is-dark="[[theme_.isDark]]"
 -        color-source-is-baseline="[[colorSourceIsBaseline]]"
 -        on-open-lens-search="onOpenLensSearch_"
-        on-open-voice-search="onOpenVoiceSearch_" shown$="[[realboxShown_]]"
-        had-secondary-side="{{realboxHadSecondarySide}}"
-        can-show-secondary-side="[[realboxCanShowSecondarySide]]">
-    </cr-realbox>
+-        on-open-voice-search="onOpenVoiceSearch_" shown$="[[realboxShown_]]">
+-    </ntp-realbox>
     <template is="dom-if" if="[[showLensUploadDialog_]]" restamp>
       <ntp-lens-upload-dialog id="lensUploadDialog"
           on-close-lens-search="onCloseLensSearch_">
-diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
--- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-+++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -455,6 +455,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
-                                             Profile* profile,
-                                             bool enable_voice_search,
-                                             bool enable_lens_search) {
-+  enable_lens_search = false;
-   // Embedders which are served from chrome-untrusted:// URLs should override
-   // this to false. The chrome.timeTicks capability that the metrics reporter
-   // depends on is not defined in chrome-untrusted environments and attempting
+diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.cc b/chrome/browser/ui/webui/realbox/realbox_handler.cc
+--- a/chrome/browser/ui/webui/realbox/realbox_handler.cc
+++ b/chrome/browser/ui/webui/realbox/realbox_handler.cc
+@@ -672,7 +672,7 @@ void RealboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+ 
+   source->AddBoolean(
+       "realboxLensSearch",
+-      profile->GetPrefs()->GetBoolean(prefs::kLensDesktopNTPSearchEnabled));
+      false);
+   source->AddString("realboxLensVariations", GetBase64UrlVariations(profile));
+   source->AddBoolean(
+       "realboxLensDirectUpload",
 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
-@@ -176,7 +176,7 @@ BASE_FEATURE(kNtpHandleMostVisitedNavigationExplicitly,
+@@ -171,7 +171,7 @@ BASE_FEATURE(kNtpHandleMostVisitedNavigationExplicitly,
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 // If enabled, logo will be shown.
@@ -62,7 +61,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
 
 // If enabled, logo will fill up less vertical space.
 BASE_FEATURE(kNtpReducedLogoSpace,
-@@ -253,8 +253,8 @@ BASE_FEATURE(kNtpMostVisitedReflowOnOverflow,
+@@ -248,8 +248,8 @@ BASE_FEATURE(kNtpMostVisitedReflowOnOverflow,
 
 // If enabled, OneGoogleBar will be shown.
 BASE_FEATURE(kNtpOneGoogleBar,
@@ -71,6 +70,6 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
 +             "NtpOneGoogleBar",                   // disabled
 +             base::FEATURE_DISABLED_BY_DEFAULT);  // by default
 
- // If enabled, outlook calendar module will be shown.
- BASE_FEATURE(kNtpOutlookCalendarModule,
+ // If enabled, Google Photos module will be shown.
+ BASE_FEATURE(kNtpPhotosModule,
 --
@@ -14,15 +14,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -668,7 +668,7 @@ public abstract class ChromeFeatureList {
+@@ -634,7 +634,7 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sSmallerTabStripTitleLimit =
-             newCachedFlag(SMALLER_TAB_STRIP_TITLE_LIMIT, true);
+             newCachedFlag(SMALLER_TAB_STRIP_TITLE_LIMIT, false);
     public static final CachedFlag sStartSurfaceAndroid =
 -            newCachedFlag(START_SURFACE_ANDROID, true);
 +            newCachedFlag(START_SURFACE_ANDROID, false);
-     public static final CachedFlag sStartSurfaceReturnTime =
-             newCachedFlag(START_SURFACE_RETURN_TIME, true);
-     public static final CachedFlag sStopAppIndexingReport =
+     public static final CachedFlag sStartSurfaceOnTablet =
+             newCachedFlag(START_SURFACE_ON_TABLET, true);
+     public static final CachedFlag sStartSurfaceRefactor =
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc
 new file mode 100644
 --- /dev/null
@@ -79,7 +79,7 @@ new file mode 100644
 diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 --- a/net/http/http_network_session.cc
 +++ b/net/http/http_network_session.cc
-@@ -209,6 +209,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
+@@ -208,6 +208,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
 
   next_protos_.push_back(kProtoHTTP11);
 
@@ -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
-@@ -78,6 +78,7 @@
+@@ -69,6 +69,7 @@
 #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 #include "url/gurl.h"
 #include "url/scheme_host_port.h"
 #include "url/url_constants.h"
-@@ -195,6 +196,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log,
+@@ -156,6 +157,38 @@ std::set<std::string> HostsFromOrigins(std::set<HostPortPair> origins) {
 
 }  // namespace
 
@@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
 
 QuicSessionRequest::~QuicSessionRequest() {
-@@ -1881,7 +1914,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -1716,7 +1749,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
               cert_verifier_, transport_security_state_, sct_auditing_delegate_,
               HostsFromOrigins(params_.origins_to_force_quic_on),
               actual_network_anonymization_key),
@@ -149,7 +149,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
 --- a/net/socket/ssl_client_socket_impl.cc
 +++ b/net/socket/ssl_client_socket_impl.cc
-@@ -293,7 +293,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -380,7 +380,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
   CHECK(context_);
 }
 
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   Disconnect();
 }
 
-@@ -677,6 +703,8 @@ int SSLClientSocketImpl::Init() {
+@@ -764,6 +790,8 @@ int SSLClientSocketImpl::Init() {
     }
     if (session)
       SSL_set_session(ssl_.get(), session.get());
@@ -192,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   }
 
   const int kBufferSize = GetDefaultOpenSSLBufferSize();
-@@ -963,6 +991,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -1062,6 +1090,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                     : SSLHandshakeDetails::kTLS13Full;
     }
   }
@@ -228,7 +228,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
 
   // Measure TLS connections that implement the renegotiation_info extension.
-@@ -1588,6 +1645,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1699,6 +1756,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
 }
 
 bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -240,7 +240,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
 --- a/net/socket/ssl_client_socket_impl.h
 +++ b/net/socket/ssl_client_socket_impl.h
-@@ -125,6 +125,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
+@@ -124,6 +124,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
   friend class SSLClientSocket;
   friend class SSLContext;
 
@@ -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
-@@ -572,6 +572,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -586,6 +586,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
     WebRuntimeFeatures::EnableV8IdleTasks(true);
   }
 
@@ -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
-@@ -276,7 +276,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -266,7 +266,7 @@ BASE_FEATURE(kEnableDrDc,
 // enabled by default on supported platforms.
 #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
     BUILDFLAG(IS_ANDROID)
@@ -36,12 +36,12 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
-@@ -378,6 +378,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -376,6 +376,7 @@ ScriptPromise GPU::requestAdapter(ScriptState* script_state,
         "WebGPU is experimental on this platform. See "
         "https://github.com/gpuweb/gpuweb/wiki/"
         "Implementation-Status#implementation-status"));
 +    //(UAZO) add site setting
   }
 
-   auto* resolver =
+   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
 --
@@ -5,36 +5,34 @@ Subject: Disable all predictors code
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/BUILD.gn                           |  2 --
- .../preloading_model_keyed_service.cc             |  3 +++
- .../preloading_model_keyed_service_factory.cc     |  4 +---
- .../optimization_guide/chrome_hints_manager.cc    |  1 +
- .../model_validator_keyed_service.cc              |  6 +++++-
- .../optimization_guide_keyed_service.cc           |  1 -
- .../predictors/loading_predictor_config.cc        |  4 ++--
- chrome/browser/predictors/predictors_features.cc  |  3 +--
- chrome/browser/ui/tab_helpers.cc                  |  1 -
- .../ui/webui/omnibox/omnibox_page_handler.cc      |  2 ++
- chrome/utility/BUILD.gn                           |  2 +-
- chrome/utility/services.cc                        |  8 --------
- .../core/browser/autofill_optimization_guide.cc   |  5 +++--
- .../omnibox/browser/autocomplete_controller.cc    |  4 ++++
- .../optimization_guide/core/hints_fetcher.cc      |  1 +
- .../optimization_guide/core/hints_manager.cc      |  5 +++++
- .../core/optimization_guide_features.cc           | 15 +++++++++------
- .../core/prediction_model_download_manager.cc     |  6 ++++--
- .../core/prediction_model_fetcher_impl.cc         |  1 +
- components/optimization_guide/features.gni        |  3 +--
- .../core/page_content_annotations_features.cc     |  5 +++++
- components/search/ntp_features.cc                 |  3 +++
- .../Disable-all-predictors-code.inc               |  4 ++++
- .../Disable-all-predictors-code.inc               |  1 +
- .../features_cc/Disable-all-predictors-code.inc   |  4 ++++
- .../features_cc/Disable-all-predictors-code.inc   |  2 ++
- services/webnn/features.gni                       |  2 +-
- .../document_speculation_rules.cc                 |  1 +
- .../platform/runtime_enabled_features.json5       |  2 +-
- 29 files changed, 66 insertions(+), 35 deletions(-)
+ chrome/browser/BUILD.gn                       |  2 --
+ .../preloading_model_keyed_service.cc         |  1 +
+ .../preloading_model_keyed_service_factory.cc |  4 +--
+ .../chrome_hints_manager.cc                   |  1 +
+ .../model_validator_keyed_service.cc          |  7 +++++-
+ .../optimization_guide_keyed_service.cc       |  1 -
+ .../predictors/loading_predictor_config.cc    |  4 +--
+ .../browser/predictors/predictors_features.cc | 11 ++------
+ chrome/browser/ui/tab_helpers.cc              |  1 -
+ .../ui/webui/omnibox/omnibox_page_handler.cc  | 14 +++++++++++
+ .../browser/autofill_optimization_guide.cc    |  5 ++--
+ .../metrics/shadow_prediction_metrics.cc      |  2 +-
+ .../browser/autocomplete_controller.cc        |  2 ++
+ .../optimization_guide/core/hints_fetcher.cc  |  1 +
+ .../optimization_guide/core/hints_manager.cc  |  5 ++++
+ .../core/optimization_guide_features.cc       | 25 +++++++++++--------
+ .../core/prediction_model_download_manager.cc |  6 +++--
+ .../core/prediction_model_fetcher_impl.cc     |  1 +
+ components/optimization_guide/features.gni    |  3 +--
+ .../phishing_classifier.cc                    |  2 +-
+ components/search/ntp_features.cc             |  3 +++
+ .../Disable-all-predictors-code.inc           |  4 +++
+ .../Disable-all-predictors-code.inc           |  7 ++++++
+ .../Disable-all-predictors-code.inc           |  4 +++
+ .../Disable-all-predictors-code.inc           |  2 ++
+ .../document_speculation_rules.cc             |  1 +
+ .../platform/runtime_enabled_features.json5   |  2 +-
+ 27 files changed, 83 insertions(+), 38 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
@@ -43,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -842,8 +842,6 @@ static_library("browser") {
+@@ -851,8 +851,6 @@ static_library("browser") {
     "navigation_predictor/navigation_predictor_keyed_service_factory.h",
     "navigation_predictor/navigation_predictor_metrics_document_data.cc",
     "navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -55,22 +53,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
-@@ -11,6 +11,7 @@
- #include "chrome/browser/navigation_predictor/preloading_model_handler.h"
- #endif
- 
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- namespace {
- 
- // The model takes all of its inputs as floats, so this is a convenience
-@@ -28,12 +29,14 @@ constexpr float ToInput(base::TimeDelta val) {
- static_assert(1.0f == ToInput(true));
- 
- }  // namespace
-+#endif
- 
- PreloadingModelKeyedService::Inputs::Inputs() = default;
- 
+@@ -16,6 +16,7 @@ PreloadingModelKeyedService::Inputs::Inputs() = default;
 PreloadingModelKeyedService::PreloadingModelKeyedService(
     OptimizationGuideKeyedService* optimization_guide_keyed_service) {
 #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
@@ -104,7 +87,15 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
 diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 --- a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
-@@ -53,13 +53,13 @@ namespace optimization_guide {
+@@ -8,6 +8,7 @@
+ #include "base/files/file_util.h"
+ #include "base/task/sequenced_task_runner.h"
+ #include "base/task/task_traits.h"
+#include "base/task/thread_pool.h"
+ #include "build/build_config.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/signin/identity_manager_factory.h"
+@@ -55,13 +56,13 @@ namespace optimization_guide {
 ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile)
     : profile_(profile) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -119,7 +110,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
   if (switches::ShouldValidateModel()) {
     // Create the validator object which will get destroyed when the model
     // load is complete.
-@@ -120,6 +120,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
+@@ -122,6 +123,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
 
 void ModelValidatorKeyedService::StartModelExecutionValidation() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -127,15 +118,15 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
   auto* opt_guide_service =
       OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
   if (!opt_guide_service) {
-@@ -137,6 +138,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
-       ModelBasedCapabilityKey::kTest, request,
+@@ -139,6 +141,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
+       proto::ModelExecutionFeature::MODEL_EXECUTION_FEATURE_TEST, request,
       base::BindOnce(&ModelValidatorKeyedService::OnModelExecuteResponse,
                      weak_ptr_factory_.GetWeakPtr()));
 +#endif
 }
 
 void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
-@@ -154,6 +156,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
+@@ -156,6 +159,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
 
 void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
     std::unique_ptr<optimization_guide::proto::ComposeRequest> request) {
@@ -143,7 +134,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   auto* opt_guide_service =
       OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
-@@ -167,6 +170,7 @@ void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
+@@ -168,6 +172,7 @@ void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
       *request, base::RepeatingCallback(base::BindRepeating(
                     &ModelValidatorKeyedService::OnDeviceModelExecuteResponse,
                     weak_ptr_factory_.GetWeakPtr())));
@@ -154,7 +145,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -544,7 +544,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -528,7 +528,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
 void OptimizationGuideKeyedService::RegisterOptimizationTypes(
     const std::vector<optimization_guide::proto::OptimizationType>&
         optimization_types) {
@@ -179,20 +170,41 @@ diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/brow
 diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/predictors/predictors_features.cc
 --- a/chrome/browser/predictors/predictors_features.cc
 +++ b/chrome/browser/predictors/predictors_features.cc
-@@ -12,8 +12,7 @@ namespace features {
- namespace {
+@@ -39,11 +39,7 @@ BASE_FEATURE(kLoadingPredictorDisregardAlwaysAccessesNetwork,
 
- constexpr base::FeatureState kFeatureEnabledOnlyOnAndroid =
-    BUILDFLAG(IS_ANDROID) ? base::FEATURE_ENABLED_BY_DEFAULT
-                          : base::FEATURE_DISABLED_BY_DEFAULT;
-+             base::FEATURE_DISABLED_BY_DEFAULT;
+ const base::FeatureState
+     kLoadingPredictorUseOptimizationGuideDefaultFeatureState =
+-#if BUILDFLAG(IS_ANDROID)
+-        base::FEATURE_ENABLED_BY_DEFAULT;
+-#else
+-        base::FEATURE_DISABLED_BY_DEFAULT;
+-#endif
+      base::FEATURE_DISABLED_BY_DEFAULT;
 
- }  // namespace
+ // Modifies loading predictor so that it can also use predictions coming from
+ // the optimization guide.
+@@ -52,11 +48,7 @@ BASE_FEATURE(kLoadingPredictorUseOptimizationGuide,
+              kLoadingPredictorUseOptimizationGuideDefaultFeatureState);
 
+ const base::FeatureState kLoadingPredictorPrefetchDefaultFeatureState =
+-#if BUILDFLAG(IS_ANDROID)
+-    base::FEATURE_ENABLED_BY_DEFAULT;
+-#else
+     base::FEATURE_DISABLED_BY_DEFAULT;
+-#endif
+ 
+ // Modifies loading predictor so that it does prefetches of subresources instead
+ // of preconnects.
+@@ -103,4 +95,5 @@ size_t GetMaxInflightPrefetches() {
+       3));
+ }
+ 
+SET_CROMITE_FEATURE_DISABLED(kLoadingPredictorUseLocalPredictions);
+ }  // namespace features
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -435,7 +435,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -414,7 +414,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   }
   MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
   NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -208,52 +220,61 @@ diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/br
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- #include "components/omnibox/browser/omnibox_field_trial.h"
+ #include "components/omnibox/browser/autocomplete_scoring_model_service.h"
 +#endif
- #include "components/optimization_guide/machine_learning_tflite_buildflags.h"
+ #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
 #include "content/public/browser/web_ui.h"
-diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
--- a/chrome/utility/BUILD.gn
-+++ b/chrome/utility/BUILD.gn
-@@ -65,7 +65,7 @@ static_library("utility") {
-     "//printing/buildflags",
-     "//services/data_decoder:lib",
-     "//services/network:network_service",
-    "//services/passage_embeddings:passage_embeddings",
-+    # "//services/passage_embeddings:passage_embeddings",
-     "//services/passage_embeddings/public/mojom",
-     "//services/screen_ai/buildflags",
-     "//services/service_manager/public/cpp",
-diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
--- a/chrome/utility/services.cc
-+++ b/chrome/utility/services.cc
-@@ -250,13 +250,6 @@ auto RunMirroringService(
-       std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
+@@ -498,6 +500,7 @@ void OmniboxPageHandler::StartOmniboxQuery(const std::string& input_string,
 }
 
-auto RunPassageEmbeddingsService(
-    mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService>
-        receiver) {
-  return std::make_unique<passage_embeddings::PassageEmbeddingsService>(
-      std::move(receiver));
-}
-
- #endif  // !BUILDFLAG(IS_ANDROID)
+ void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) {
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+   if (auto* service = GetMlService()) {
+     auto version = service->GetModelVersion();
+     if (version == -1) {
+@@ -510,10 +513,14 @@ void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) {
+   } else {
+     std::move(callback).Run(-1);
+   }
+#else
+  std::move(callback).Run(-1);
+#endif
+ }
 
- #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-@@ -463,7 +456,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
- #if !BUILDFLAG(IS_ANDROID)
-   services.Add(RunProfileImporter);
-   services.Add(RunMirroringService);
-  services.Add(RunPassageEmbeddingsService);
- #endif  // !BUILDFLAG(IS_ANDROID)
+ void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals,
+                                  StartMlCallback callback) {
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+   if (auto* service = GetMlService()) {
+     AutocompleteMatch::ScoringSignals signals =
+         mojo::ConvertTo<AutocompleteMatch::ScoringSignals>(mojom_signals);
+@@ -523,6 +530,9 @@ void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals,
+   } else {
+     std::move(callback).Run(-1);
+   }
+#else
+  std::move(callback).Run(-1);
+#endif
+ }
 
- #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
+ std::unique_ptr<AutocompleteController> OmniboxPageHandler::CreateController(
+@@ -547,8 +557,12 @@ OmniboxPageHandler::GetAutocompleteControllerType(
+ }
+ 
+ AutocompleteScoringModelService* OmniboxPageHandler::GetMlService() {
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+   return OmniboxFieldTrial::IsMlUrlScoringEnabled()
+              ? AutocompleteScoringModelServiceFactory::GetInstance()
+                    ->GetForProfile(profile_)
+              : nullptr;
+#else
+  return nullptr;
+#endif
+ }
 diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/components/autofill/core/browser/autofill_optimization_guide.cc
 --- a/components/autofill/core/browser/autofill_optimization_guide.cc
 +++ b/components/autofill/core/browser/autofill_optimization_guide.cc
-@@ -172,6 +172,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
+@@ -163,6 +163,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
   // If we do not have any optimization types to register, do not do anything.
   if (!optimization_types.empty()) {
     // Register all optimization types that we need based on `form_structure`.
@@ -261,7 +282,7 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
     decider_->RegisterOptimizationTypes(
         std::vector<optimization_guide::proto::OptimizationType>(
             std::move(optimization_types).extract()));
-@@ -223,7 +224,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
+@@ -214,7 +215,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
     AutofillField* field) const {
   // If the field's storable type is `IBAN_VALUE`, check whether IBAN
   // suggestions should be blocked based on `url`.
@@ -270,51 +291,47 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
     optimization_guide::OptimizationGuideDecision decision =
         decider_->CanApplyOptimization(
             url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED,
-@@ -249,7 +250,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
-     const CreditCard& card) const {
+@@ -240,7 +241,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
+     const CreditCard* card) const {
   if (auto optimization_type =
-           GetVcnMerchantOptOutOptimizationTypeForCard(card);
+           GetVcnMerchantOptOutOptimizationTypeForCard(*card);
 -      optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) {
 +      decider_ && optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) {
     optimization_guide::OptimizationGuideDecision decision =
         decider_->CanApplyOptimization(url, optimization_type,
                                        /*optimization_metadata=*/nullptr);
+diff --git a/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc b/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
+--- a/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
+++ b/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
+@@ -74,7 +74,7 @@ void LogRegexShadowPredictions(const AutofillField& field) {
+ 
+ void LogMlShadowPredictions(const AutofillField& field) {
+ #if !BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+-  return;
+  if ((true)) return;
+ #endif
+   if (!base::FeatureList::IsEnabled(features::kAutofillModelPredictions)) {
+     return;
 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
-@@ -46,7 +46,9 @@
- #include "components/omnibox/browser/autocomplete_input.h"
+@@ -47,7 +47,9 @@
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
 #include "components/omnibox/browser/autocomplete_provider_client.h"
+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+ #include "components/omnibox/browser/autocomplete_scoring_model_service.h"
 +#endif
 #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
 #include "components/omnibox/browser/bookmark_provider.h"
 #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
-@@ -119,6 +121,7 @@ using ProviderType = AutocompleteProvider::Type;
- 
- constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
- 
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
-                            size_t total_scored_matches) {
-   int percent_score_coverage =
-@@ -207,6 +210,7 @@ void RecordScoringSignalCoverageForProvider(
-         pair.second);
-   }
- }
-+#endif
- 
- // Appends available autocompletion of the given type, subtype, and number to
- // the existing available autocompletions string, encoding according to the
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -185,6 +185,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -183,6 +183,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
     bool skip_cache,
     HintsFetchedCallback hints_fetched_callback,
-     std::optional<proto::RequestContextMetadata> request_context_metadata) {
+     proto::RequestContextMetadata* request_context_metadata) {
 +  if ((true)) return false;
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK_GT(optimization_types.size(), 0u);
@@ -322,7 +339,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -393,6 +393,7 @@ void HintsManager::Shutdown() {
+@@ -390,6 +390,7 @@ void HintsManager::Shutdown() {
 OptimizationGuideDecision
 HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
     OptimizationTypeDecision optimization_type_decision) {
@@ -330,15 +347,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
   switch (optimization_type_decision) {
     case OptimizationTypeDecision::kAllowedByOptimizationFilter:
     case OptimizationTypeDecision::kAllowedByHint:
-@@ -1116,6 +1117,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1110,6 +1111,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
     OnDemandOptimizationGuideDecisionRepeatingCallback callback,
-     std::optional<proto::RequestContextMetadata> request_context_metadata) {
+     proto::RequestContextMetadata* request_context_metadata) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +  if ((true)) return; // no consent on bromite
 
   InsertionOrderedSet<GURL> urls_to_fetch;
   InsertionOrderedSet<std::string> hosts_to_fetch;
-@@ -1421,6 +1423,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1416,6 +1418,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
     bool skip_cache,
     OptimizationMetadata* optimization_metadata) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -351,9 +368,16 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
 diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
 --- a/components/optimization_guide/core/optimization_guide_features.cc
 +++ b/components/optimization_guide/core/optimization_guide_features.cc
-@@ -37,11 +37,7 @@ namespace features {
+@@ -37,18 +37,10 @@ namespace features {
 namespace {
 
+ constexpr auto enabled_by_default_desktop_only =
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+     base::FEATURE_DISABLED_BY_DEFAULT;
+-#else
+-    base::FEATURE_ENABLED_BY_DEFAULT;
+-#endif
+ 
 constexpr auto enabled_by_default_mobile_only =
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
 -    base::FEATURE_ENABLED_BY_DEFAULT;
@@ -361,9 +385,9 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
     base::FEATURE_DISABLED_BY_DEFAULT;
 -#endif
 
- }  // namespace
- 
-@@ -430,8 +426,7 @@ size_t MaxURLKeyedHintCacheSize() {
+ // Returns whether |locale| is a supported locale for |feature|.
+ //
+@@ -575,8 +567,7 @@ size_t MaxURLKeyedHintCacheSize() {
 }
 
 bool ShouldPersistHintsToDisk() {
@@ -373,8 +397,8 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 }
 
 RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
-@@ -871,5 +866,13 @@ int GetOnDeviceModelValidationAttemptCount() {
-   return kParam.Get();
+@@ -1080,5 +1071,19 @@ bool GetOnDeviceModelRetractRepeats() {
+   return kOnDeviceModelRetractRepeats.Get();
 }
 
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationHints);
@@ -382,8 +406,14 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 +SET_CROMITE_FEATURE_DISABLED(kRemoteOptimizationGuideFetchingAnonymousDataConsent);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationTargetPrediction);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideModelDownloading);
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
+SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
+SET_CROMITE_FEATURE_DISABLED(kPageEntitiesPageContentAnnotations);
 +SET_CROMITE_FEATURE_DISABLED(kPushNotifications);
+SET_CROMITE_FEATURE_DISABLED(kPageVisibilityBatchAnnotations);
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
 +SET_CROMITE_FEATURE_DISABLED(kPreventLongRunningPredictionModels);
+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideFetchingForSRP);
 }  // namespace features
 }  // namespace optimization_guide
@@ -399,7 +429,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
     0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
 const net::NetworkTrafficAnnotationTag
     kOptimizationGuidePredictionModelsTrafficAnnotation =
-@@ -105,7 +105,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
+@@ -104,7 +104,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
     GetBaseModelDirForDownloadCallback get_base_model_dir_for_download_callback,
     scoped_refptr<base::SequencedTaskRunner> background_task_runner)
     : download_service_(download_service),
@@ -408,7 +438,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
       api_key_(features::GetOptimizationGuideServiceAPIKey()),
       get_base_model_dir_for_download_callback_(
           get_base_model_dir_for_download_callback),
-@@ -116,6 +116,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
+@@ -115,6 +115,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
 void PredictionModelDownloadManager::StartDownload(
     const GURL& download_url,
     proto::OptimizationTarget optimization_target) {
@@ -416,7 +446,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
   download::DownloadParams download_params;
   download_params.client =
       download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
-@@ -265,6 +266,7 @@ bool PredictionModelDownloadManager::VerifyDownload(
+@@ -260,6 +261,7 @@ bool PredictionModelDownloadManager::VerifyDownload(
     const base::FilePath& download_file_path,
     const base::FilePath& base_model_dir,
     bool delete_file_on_error) {
@@ -448,23 +478,22 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 }
 
 declare_args() {
-diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
--- a/components/page_content_annotations/core/page_content_annotations_features.cc
-+++ b/components/page_content_annotations/core/page_content_annotations_features.cc
-@@ -280,4 +280,9 @@ size_t MaxRelatedSearchesCacheSize() {
-       "max_related_searches_cache_size", 10);
+diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
+--- a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
+++ b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
+@@ -234,7 +234,7 @@ void PhishingClassifier::VisualExtractionFinished(bool success) {
+       *bitmap_, base::BindOnce(&PhishingClassifier::OnVisualTfLiteModelDone,
+                                weak_factory_.GetWeakPtr(), std::move(verdict)));
+ #else
+-  RunCallback(*verdict);
+  //RunCallback(*verdict);
+ #endif
 }
 
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
-+SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
-+SET_CROMITE_FEATURE_DISABLED(kPageVisibilityBatchAnnotations);
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
- }  // namespace page_content_annotations::features
 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
-@@ -574,4 +574,7 @@ std::vector<std::string> GetModulesOrder() {
+@@ -544,4 +544,7 @@ std::vector<std::string> GetModulesOrder() {
                            base::SplitResult::SPLIT_WANT_NONEMPTY);
 }
 
@@ -485,8 +514,14 @@ diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predicto
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
-@@ -0,0 +1 @@
+@@ -0,0 +1,7 @@
 +SET_CROMITE_FEATURE_DISABLED(kPrerenderFallbackToPreconnect);
+
+#if !BUILDFLAG(IS_ANDROID)
+
+SET_CROMITE_FEATURE_DISABLED(kSafetyCheckNotificationPermissions);
+
+#endif
 diff --git a/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -503,33 +538,21 @@ new file mode 100644
@@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kNavigationPredictor);
 +SET_CROMITE_FEATURE_DISABLED(kPreloadingHeuristicsMLModel);
-diff --git a/services/webnn/features.gni b/services/webnn/features.gni
--- a/services/webnn/features.gni
-+++ b/services/webnn/features.gni
-@@ -5,7 +5,7 @@
- import("//build/config/features.gni")
- 
- declare_args() {
-  webnn_use_tflite = is_android || is_chromeos || is_linux || is_win
-+  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_win
- 
-   # Enable logging of TFLite profiling information on MLGraph destruction.
-   webnn_enable_tflite_profiler = false
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
-@@ -660,6 +660,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
+@@ -599,6 +599,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
     return;
   }
 
 +  if ((true)) return;
   HeapVector<Member<SpeculationCandidate>> candidates;
-   auto push_candidates = [&candidates, &document](
+   auto push_candidates = [&candidates, &execution_context](
                              mojom::blink::SpeculationAction action,
 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
-@@ -3109,7 +3109,7 @@
+@@ -2961,7 +2961,7 @@
       //
       // It also has some feature params defined throughout the codebase.
       name: "Prerender2",
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1312,6 +1312,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1243,6 +1243,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
     }
 
     private boolean maybeShowPromo(Profile profile) {
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -144,7 +144,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -138,7 +138,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                 false);
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
 --- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
 +++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
-@@ -75,6 +75,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const {
+@@ -132,6 +132,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const {
 
 bool BrowserFeaturePromoController::CanShowPromoForElement(
     ui::TrackedElement* anchor_element) const {
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_contro
 diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 --- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 +++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
-@@ -125,6 +125,7 @@ public class UserEducationHelper {
+@@ -74,6 +74,7 @@ public class UserEducationHelper {
     }
 
     private void showIPH(Tracker tracker, IPHCommand iphCommand) {
@@ -62,19 +62,19 @@ diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/
 diff --git a/components/user_education/common/feature_promo_controller.cc b/components/user_education/common/feature_promo_controller.cc
 --- a/components/user_education/common/feature_promo_controller.cc
 +++ b/components/user_education/common/feature_promo_controller.cc
-@@ -669,6 +669,7 @@ FeaturePromoResult FeaturePromoControllerCommon::CanShowPromoCommon(
-     const FeaturePromoSpecification** display_spec_out,
+@@ -589,6 +589,7 @@ FeaturePromoResult FeaturePromoControllerCommon::CanShowPromoCommon(
+     const FeaturePromoSpecification** spec_out,
     std::unique_ptr<FeaturePromoLifecycle>* lifecycle_out,
     ui::TrackedElement** anchor_element_out) const {
 +  if ((true)) return FeaturePromoResult::kBlockedByContext;
-   const bool for_demo = source == ShowSource::kDemo;
- 
   // Ensure that this promo isn't already queued for startup.
+   //
+   // Note that this check is bypassed if this is for an explicit demo, but not
 diff --git a/components/user_education/common/feature_promo_registry.cc b/components/user_education/common/feature_promo_registry.cc
 --- a/components/user_education/common/feature_promo_registry.cc
 +++ b/components/user_education/common/feature_promo_registry.cc
-@@ -20,6 +20,7 @@ FeaturePromoRegistry& FeaturePromoRegistry::operator=(
- FeaturePromoRegistry::~FeaturePromoRegistry() = default;
+@@ -29,6 +29,7 @@ const FeaturePromoSpecification* FeaturePromoRegistry::GetParamsForFeature(
+ }
 
 void FeaturePromoRegistry::RegisterFeature(FeaturePromoSpecification spec) {
 +  if ((true)) return;
@@ -14,8 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/aw_content_browser_client.cc      |   3 +
 .../chromium/android_webview/AwSettings.java  |   4 +-
 chrome/android/java/AndroidManifest.xml       |   4 -
- .../aggregatable_trigger_config.cc            |   2 +-
- components/attribution_reporting/features.cc  |   1 +
+ components/attribution_reporting/features.cc  |   2 +
 .../origin_trials/features.cc                 |   2 +
 .../render_view_context_menu_base.cc          |   3 -
 .../aggregatable_report_sender.cc             |  15 +-
@@ -27,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../attribution_storage_sql.cc                |   8 +-
 content/browser/storage_partition_impl.cc     |   9 -
 content/public/android/BUILD.gn               |   2 -
- .../browser/AttributionOsLevelManager.java    | 349 +-----------------
+ .../browser/AttributionOsLevelManager.java    | 312 +-----------------
 .../public/browser/content_browser_client.cc  |   7 +-
 .../public/browser/navigation_controller.cc   |   1 -
 .../Disable-conversion-measurement-api.inc    |   1 +
@@ -37,9 +36,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../attribution/request_headers_internal.cc   |   1 +
 .../network/public/cpp/attribution_utils.cc   |   2 +
 third_party/blink/renderer/core/page/page.cc  |   2 +-
- .../platform/runtime_enabled_features.json5   |   1 +
 ui/events/android/motion_event_android.cc     |   6 +-
- 28 files changed, 73 insertions(+), 376 deletions(-)
+ 26 files changed, 72 insertions(+), 338 deletions(-)
 create mode 100644 cromite_flags/content/common/features_cc/Disable-conversion-measurement-api.inc
 create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
@@ -48,36 +46,36 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1246,6 +1246,7 @@ network::mojom::AttributionSupport
+@@ -1163,6 +1163,7 @@ network::mojom::AttributionSupport
 AwContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
-     bool client_os_disabled) {
+     content::WebContents* web_contents) {
 +  if ((true)) return network::mojom::AttributionSupport::kNone;
-   // WebView only supports OS-level attribution and not web-attribution.
-   switch (state) {
-     case AttributionReportingOsApiState::kDisabled:
-@@ -1264,6 +1265,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+   AwSettings* aw_settings = AwSettings::FromWebContents(web_contents);
+   if (aw_settings && aw_settings->GetAttributionBehavior() ==
+                          AwSettings::AttributionBehavior::DISABLED) {
+@@ -1187,6 +1188,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
 +  if ((true))
 +    return false;
-   AwBrowserContext* aw_context =
-       static_cast<AwBrowserContext*>(browser_context);
-   // WebView only supports OS-level attribution and not web-attribution.
+   // Check if attribution reporting has been disabled.
+   // This method should not be called at all if the configured behavior is
+   // DISABLED.
 diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
-@@ -172,7 +172,7 @@ public class AwSettings {
+@@ -162,7 +162,7 @@ public class AwSettings {
     private boolean mSpatialNavigationEnabled; // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
 -    private int mAttributionBehavior = AttributionBehavior.APP_SOURCE_AND_WEB_TRIGGER;
 +    private int mAttributionBehavior = AttributionBehavior.DISABLED;
- 
-     @SpeculativeLoadingAllowedFlags
-     private int mSpeculativeLoadingAllowedFlags =
-@@ -1773,7 +1773,7 @@ public class AwSettings {
+     private boolean mCSSHexAlphaColorEnabled;
+     private boolean mScrollTopLeftInteropEnabled;
+     private boolean mWillSuppressErrorPage;
+@@ -1689,7 +1689,7 @@ public class AwSettings {
     public void setAttributionBehavior(@AttributionBehavior int behavior) {
         synchronized (mAwSettingsLock) {
             if (mAttributionBehavior != behavior) {
@@ -97,7 +95,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"/>
     <!--
-@@ -1151,9 +1150,6 @@ by a child template that "extends" this file.
+@@ -1165,9 +1164,6 @@ by a child template that "extends" this file.
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
         </activity>
 
@@ -107,26 +105,15 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
         {% set enable_openxr = enable_openxr|default(0) %}
         {% if enable_openxr == "true" %}
           <!-- launchMode is set to singleTask because there should never be multiple copies of the app running. -->
-diff --git a/components/attribution_reporting/aggregatable_trigger_config.cc b/components/attribution_reporting/aggregatable_trigger_config.cc
--- a/components/attribution_reporting/aggregatable_trigger_config.cc
-+++ b/components/attribution_reporting/aggregatable_trigger_config.cc
-@@ -86,7 +86,7 @@ bool IsValid(SourceRegistrationTimeConfig source_registration_time_config,
- 
- base::expected<std::optional<std::string>, TriggerRegistrationError>
- ParseTriggerContextId(base::Value* value) {
-  if (!value) {
-+  if ((true)) {
-     return std::nullopt;
-   }
- 
 diff --git a/components/attribution_reporting/features.cc b/components/attribution_reporting/features.cc
 --- a/components/attribution_reporting/features.cc
 +++ b/components/attribution_reporting/features.cc
-@@ -17,4 +17,5 @@ BASE_FEATURE(kAttributionAggregatableDebugReporting,
-              "AttributionAggregatableDebugReporting",
+@@ -17,4 +17,6 @@ BASE_FEATURE(kAttributionReportingTriggerContextId,
+              "AttributionReportingTriggerContextId",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kConversionMeasurement);
+SET_CROMITE_FEATURE_DISABLED(kAttributionReportingTriggerContextId);
 }  // namespace attribution_reporting::features
 diff --git a/components/embedder_support/origin_trials/features.cc b/components/embedder_support/origin_trials/features.cc
 --- a/components/embedder_support/origin_trials/features.cc
@@ -141,7 +128,7 @@ diff --git a/components/embedder_support/origin_trials/features.cc b/components/
 diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
 --- a/components/renderer_context_menu/render_view_context_menu_base.cc
 +++ b/components/renderer_context_menu/render_view_context_menu_base.cc
-@@ -503,9 +503,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
+@@ -502,9 +502,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
 
   open_url_params.source_site_instance = site_instance_;
 
@@ -154,7 +141,7 @@ diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b
 diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b/content/browser/aggregation_service/aggregatable_report_sender.cc
 --- a/content/browser/aggregation_service/aggregatable_report_sender.cc
 +++ b/content/browser/aggregation_service/aggregatable_report_sender.cc
-@@ -138,19 +138,18 @@ void AggregatableReportSender::SendReport(const GURL& url,
+@@ -137,19 +137,18 @@ void AggregatableReportSender::SendReport(const GURL& url,
   // Allow bodies of non-2xx responses to be returned.
   simple_url_loader_ptr->SetAllowHttpErrorResults(true);
 
@@ -184,8 +171,8 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 diff --git a/content/browser/aggregation_service/aggregation_service_features.cc b/content/browser/aggregation_service/aggregation_service_features.cc
 --- a/content/browser/aggregation_service/aggregation_service_features.cc
 +++ b/content/browser/aggregation_service/aggregation_service_features.cc
-@@ -20,4 +20,5 @@ BASE_FEATURE(kPrivacySandboxAggregationServiceFilteringIds,
-              "PrivacySandboxAggregationServiceFilteringIds",
+@@ -20,4 +20,5 @@ BASE_FEATURE(kPrivacySandboxAggregationServiceReportPadding,
+              "PrivacySandboxAggregationServiceReportPadding",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAggregationService);
@@ -193,10 +180,10 @@ diff --git a/content/browser/aggregation_service/aggregation_service_features.cc
 diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
-@@ -1134,6 +1134,7 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -924,6 +924,7 @@ void AttributionDataHostManagerImpl::ParseHeader(
     HeaderPendingDecode pending_decode,
     Registrar registrar) {
-   CHECK(it != registrations_.end());
+   DCHECK(it != registrations_.end());
 +  if ((true)) return;
 
   switch (it->eligibility()) {
@@ -204,7 +191,7 @@ 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
-@@ -258,6 +258,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -257,6 +257,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
     return;
   }
 
@@ -215,15 +202,15 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
 diff --git a/content/browser/attribution_reporting/attribution_os_level_manager.cc b/content/browser/attribution_reporting/attribution_os_level_manager.cc
 --- a/content/browser/attribution_reporting/attribution_os_level_manager.cc
 +++ b/content/browser/attribution_reporting/attribution_os_level_manager.cc
-@@ -46,6 +46,7 @@ std::optional<ApiState> g_state GUARDED_BY_CONTEXT(GetSequenceChecker());
- 
+@@ -47,6 +47,7 @@ std::optional<ApiState> g_state GUARDED_BY_CONTEXT(GetSequenceChecker());
 // static
- bool AttributionOsLevelManager::ShouldInitializeApiState() {
+ bool AttributionOsLevelManager::ShouldUseOsWebSource(
+     GlobalRenderFrameHostId render_frame_id) {
 +  if ((true)) return false;
-   DCHECK_CALLED_ON_VALID_SEQUENCE(GetSequenceChecker());
-   if (g_state.has_value()) {
-     return false;
-@@ -57,7 +58,7 @@ bool AttributionOsLevelManager::ShouldInitializeApiState() {
+   return GetContentClient()
+       ->browser()
+       ->ShouldUseOsWebSourceAttributionReporting(
+@@ -75,7 +76,7 @@ bool AttributionOsLevelManager::ShouldInitializeApiState() {
 // static
 ApiState AttributionOsLevelManager::GetApiState() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(GetSequenceChecker());
@@ -235,7 +222,7 @@ diff --git a/content/browser/attribution_reporting/attribution_os_level_manager.
 diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
 --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
 +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
-@@ -125,6 +125,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
+@@ -89,6 +89,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
                                                 const std::string& body,
                                                 net::HttpRequestHeaders headers,
                                                 UrlLoaderCallback callback) {
@@ -245,7 +232,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
   auto resource_request = std::make_unique<network::ResourceRequest>();
   resource_request->url = std::move(url);
   resource_request->headers = std::move(headers);
-@@ -200,6 +203,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -164,6 +167,12 @@ void AttributionReportNetworkSender::OnReportSent(
     ReportSentCallback sent_callback,
     UrlLoaderList::iterator it,
     scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -261,7 +248,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
-@@ -471,14 +471,16 @@ base::FilePath DatabasePath(const base::FilePath& user_data_directory) {
+@@ -459,14 +459,16 @@ base::FilePath DatabasePath(const base::FilePath& user_data_directory) {
   return user_data_directory.Append(kDatabasePath);
 }
 
@@ -271,7 +258,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 
 AttributionStorageSql::AttributionStorageSql(
     const base::FilePath& user_data_directory,
-     AttributionResolverDelegate* delegate)
+     std::unique_ptr<AttributionStorageDelegate> delegate)
 -    : path_to_database_(user_data_directory.empty()
 -                            ? base::FilePath()
 -                            : DatabasePath(user_data_directory)),
@@ -279,12 +266,12 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 +                             ? base::FilePath()
 +                             : DatabasePath(user_data_directory)),
       db_(sql::DatabaseOptions{.page_size = 4096, .cache_size = 32}),
-       delegate_(delegate),
-       rate_limit_table_(delegate_),
+       delegate_(std::move(delegate)),
+       rate_limit_table_(delegate_.get()) {
 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
-@@ -1488,15 +1488,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1443,15 +1443,6 @@ void StoragePartitionImpl::Initialize(
 
   bucket_manager_ = std::make_unique<BucketManager>(this);
 
@@ -303,7 +290,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
-@@ -189,8 +189,6 @@ android_library("content_full_java") {
+@@ -181,8 +181,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",
@@ -334,7 +321,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 
 import org.jni_zero.CalledByNative;
 import org.jni_zero.JNINamespace;
-@@ -56,6 +44,10 @@ import java.util.concurrent.TimeoutException;
+@@ -54,6 +42,10 @@ import java.util.concurrent.TimeoutException;
  */
 @JNINamespace("content")
 public class AttributionOsLevelManager {
@@ -345,62 +332,27 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     private static final String TAG = "AttributionManager";
     // TODO: replace with constant in android.Manifest.permission once it becomes available in U.
     private static final String PERMISSION_ACCESS_ADSERVICES_ATTRIBUTION =
-@@ -140,100 +132,11 @@ public class AttributionOsLevelManager {
+@@ -118,63 +110,11 @@ public class AttributionOsLevelManager {
     }
 
     private static boolean supportsAttribution() {
 -        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
 -    }
 -
-    private static @OperationResult int getOperationResultFromMessage(String message) {
-        if (message == null) {
-            return OperationResult.ERROR_UNKNOWN;
-        } else {
-            String lowerMessage = message.toLowerCase(Locale.US);
-            if (lowerMessage.contains("background")) {
-                return OperationResult.ERROR_BACKGROUND_CALLER;
-            } else if (lowerMessage.contains("unable to find the service")) {
-                return OperationResult.ERROR_SERVICE_NOT_FOUND;
-            } else if (lowerMessage.contains("service is not available")) {
-                return OperationResult.ERROR_SERVICE_UNAVAILABLE;
-            } else if (lowerMessage.contains("api rate limit exceeded")) {
-                return OperationResult.ERROR_API_RATE_LIMIT_EXCEEDED;
-            } else if (lowerMessage.contains("server rate limit exceeded")) {
-                return OperationResult.ERROR_SERVER_RATE_LIMIT_EXCEEDED;
-            } else if (lowerMessage.contains(
-                    "caller is not authorized to access information from another user")) {
-                return OperationResult.ERROR_CALLER_NOT_ALLOWED_TO_CROSS_USER_BOUNDARIES;
-            } else if (lowerMessage.contains(
-                    "caller is not allowed to perform this operation on behalf of the given"
-                            + " package")) {
-                return OperationResult.ERROR_CALLER_NOT_ALLOWED_ON_BEHALF;
-            } else if (lowerMessage.contains("permission was not requested")) {
-                return OperationResult.ERROR_PERMISSION_NOT_REQUESTED;
-            } else if (lowerMessage.contains("caller is not allowed")) {
-                return OperationResult.ERROR_CALLER_NOT_ALLOWED;
-            } else if (lowerMessage.contains("api time out")) {
-                return OperationResult.ERROR_TIMEOUT;
-            } else if (lowerMessage.contains("failed to encrypt responses")) {
-                return OperationResult.ERROR_ENCRYPTION_FAILURE;
-            } else if (lowerMessage.contains(
-                    "service received an invalid object from the server")) {
-                return OperationResult.ERROR_INVALID_OBJECT;
-            } else {
-                return OperationResult.ERROR_UNKNOWN;
-            }
-        }
-    }
-
 -    private static @OperationResult int convertToOperationResult(Throwable thrown) {
-        @OperationResult int result = getOperationResultFromMessage(thrown.getMessage());
-        if (result != OperationResult.ERROR_UNKNOWN) {
-            return result;
-        } else if (thrown instanceof IllegalArgumentException) {
+-        if (thrown instanceof IllegalArgumentException) {
 -            return OperationResult.ERROR_ILLEGAL_ARGUMENT;
 -        } else if (thrown instanceof IOException) {
 -            return OperationResult.ERROR_IO;
 -        } else if (thrown instanceof IllegalStateException) {
-            return OperationResult.ERROR_ILLEGAL_STATE;
+-            // The Android API doesn't break out this error as a separate exception so we
+-            // are forced to inspect the message for now.
+-            if (thrown.getMessage() != null
+-                    && thrown.getMessage().toLowerCase(Locale.US).contains("background")) {
+-                return OperationResult.ERROR_BACKGROUND_CALLER;
+-            } else {
+-                return OperationResult.ERROR_ILLEGAL_STATE;
+-            }
 -        } else if (thrown instanceof SecurityException) {
 -            return OperationResult.ERROR_SECURITY;
 -        } else if (thrown instanceof TimeoutException) {
@@ -408,8 +360,6 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
 -                && thrown instanceof LimitExceededException) {
 -            return OperationResult.ERROR_LIMIT_EXCEEDED;
-        } else if (thrown instanceof InvalidObjectException) {
-            return OperationResult.ERROR_INVALID_OBJECT;
 -        } else {
 -            return OperationResult.ERROR_UNKNOWN;
 -        }
@@ -443,11 +393,11 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -        assert suffix.length() > 0;
 -
 -        RecordHistogram.recordEnumeratedHistogram(
-                "Conversions.AndroidOperationResult2." + suffix, result, OperationResult.COUNT);
+-                "Conversions.AndroidOperationResult." + suffix, result, OperationResult.COUNT);
     }
 
     @CalledByNative
-@@ -242,22 +145,7 @@ public class AttributionOsLevelManager {
+@@ -183,22 +123,7 @@ public class AttributionOsLevelManager {
     }
 
     private MeasurementManagerFutures getManager() {
@@ -471,7 +421,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     private void onRegistrationCompleted(
-@@ -271,28 +159,6 @@ public class AttributionOsLevelManager {
+@@ -212,28 +137,6 @@ public class AttributionOsLevelManager {
         }
     }
 
@@ -500,7 +450,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     @CalledByNative
     private static List<WebSourceParams> createWebSourceParamsList(int size) {
         if (!supportsAttribution()) {
-@@ -307,7 +173,6 @@ public class AttributionOsLevelManager {
+@@ -248,7 +151,6 @@ public class AttributionOsLevelManager {
         if (!supportsAttribution()) {
             return;
         }
@@ -508,7 +458,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     /**
-@@ -324,32 +189,12 @@ public class AttributionOsLevelManager {
+@@ -265,32 +167,12 @@ public class AttributionOsLevelManager {
                     OperationResult.ERROR_VERSION_UNSUPPORTED);
             return;
         }
@@ -540,8 +490,8 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -                            .RegisterSourceOptIn.class)
     @CalledByNative
     private void registerAttributionSource(
-             int requestId, @JniType("std::vector") GURL[] registrationUrls, MotionEvent event) {
-@@ -360,37 +205,16 @@ public class AttributionOsLevelManager {
+             int requestId, GURL[] registrationUrls, MotionEvent event) {
+@@ -301,37 +183,16 @@ public class AttributionOsLevelManager {
                     OperationResult.ERROR_VERSION_UNSUPPORTED);
             return;
         }
@@ -580,7 +530,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     /**
-@@ -407,18 +231,6 @@ public class AttributionOsLevelManager {
+@@ -348,18 +209,6 @@ public class AttributionOsLevelManager {
                     OperationResult.ERROR_VERSION_UNSUPPORTED);
             return;
         }
@@ -599,7 +549,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     /**
-@@ -434,15 +246,6 @@ public class AttributionOsLevelManager {
+@@ -375,15 +224,6 @@ public class AttributionOsLevelManager {
                     OperationResult.ERROR_VERSION_UNSUPPORTED);
             return;
         }
@@ -615,7 +565,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     private void onDataDeletionCompleted(int requestId) {
-@@ -477,96 +280,7 @@ public class AttributionOsLevelManager {
+@@ -418,96 +258,7 @@ public class AttributionOsLevelManager {
             onDataDeletionCompleted(requestId);
             return;
         }
@@ -713,7 +663,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
     }
 
     private static void onMeasurementStateReturned(int status, @OperationResult int result) {
-@@ -582,6 +296,10 @@ public class AttributionOsLevelManager {
+@@ -523,6 +274,10 @@ public class AttributionOsLevelManager {
     private static void getMeasurementApiStatus() {
         ThreadUtils.assertOnBackgroundThread();
 
@@ -724,7 +674,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
         if (sManagerForTesting != null) {
             AttributionOsLevelManagerJni.get().onMeasurementStateReturned(1);
             return;
-@@ -601,49 +319,6 @@ public class AttributionOsLevelManager {
+@@ -542,49 +297,6 @@ public class AttributionOsLevelManager {
             onMeasurementStateReturned(/* status= */ 0, OperationResult.ERROR_PERMISSION_UNGRANTED);
             return;
         }
@@ -777,15 +727,15 @@ 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
-@@ -550,6 +550,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -543,6 +543,7 @@ void ContentBrowserClient::OnAuctionComplete(
 network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
-     bool client_os_disabled) {
+     content::WebContents* web_contents) {
 +  if ((true)) return network::mojom::AttributionSupport::kNone;
   switch (state) {
     case AttributionReportingOsApiState::kDisabled:
       return network::mojom::AttributionSupport::kWeb;
-@@ -567,13 +568,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -559,17 +560,17 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -793,18 +743,14 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
 +  return false;
 }
 
- ContentBrowserClient::AttributionReportingOsRegistrars
- ContentBrowserClient::GetAttributionReportingOsRegistrars(
-     WebContents* web_contents) {
-  return {AttributionReportType::kWeb, AttributionReportType::kWeb};
-+  return {AttributionReportType::kDisabled, AttributionReportType::kDisabled};
+ bool ContentBrowserClient::ShouldUseOsWebSourceAttributionReporting(
+     content::RenderFrameHost* rfh) {
+-  return true;
+  return false;
 }
 
- bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -581,7 +582,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-     content::RenderFrameHost* rfh,
-     const url::Origin& context_origin,
-     const url::Origin& reporting_origin) {
+ bool ContentBrowserClient::ShouldUseOsWebTriggerAttributionReporting(
+     content::RenderFrameHost* rfh) {
 -  return true;
 +  return false;
 }
@@ -886,7 +832,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
 diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
 --- a/third_party/blink/renderer/core/page/page.cc
 +++ b/third_party/blink/renderer/core/page/page.cc
-@@ -1436,7 +1436,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1352,7 +1352,7 @@ void Page::UpdateBrowsingContextGroup(
 
 void Page::SetAttributionSupport(
     network::mojom::AttributionSupport attribution_support) {
@@ -895,21 +841,10 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
 }
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
-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
-@@ -4016,6 +4016,7 @@
-     },
-     {
-       name: "TopicsAPI",
-+      status: "experimental",
-       base_feature: "none",
-       origin_trial_feature_name: "PrivacySandboxAdsAPIs",
-       origin_trial_allows_third_party: true,
 diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motion_event_android.cc
 --- a/ui/events/android/motion_event_android.cc
 +++ b/ui/events/android/motion_event_android.cc
-@@ -166,7 +166,11 @@ int ToEventFlags(int meta_state, int button_state) {
+@@ -162,7 +162,11 @@ int ToEventFlags(int meta_state, int button_state) {
 }
 
 base::TimeTicks FromAndroidTime(base::TimeTicks time) {
@@ -11,7 +11,7 @@ Subject: Disable crash reporting
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2584,15 +2584,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2509,15 +2509,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
         base::NumberToString(pid));
   }
 #endif
@@ -17,7 +17,7 @@ diff --git a/third_party/blink/renderer/core/loader/ping_loader.cc b/third_party
   if (!frame->DomWindow()
            ->GetContentSecurityPolicyForWorld(&state.World())
            ->AllowConnectToSource(url, url, RedirectStatus::kNoRedirect)) {
-@@ -107,6 +108,7 @@ bool SendBeaconCommon(const ScriptState& state,
+@@ -103,6 +104,7 @@ bool SendBeaconCommon(const ScriptState& state,
 void PingLoader::SendLinkAuditPing(LocalFrame* frame,
                                    const KURL& ping_url,
                                    const KURL& destination_url) {
@@ -25,7 +25,7 @@ diff --git a/third_party/blink/renderer/core/loader/ping_loader.cc b/third_party
   if (!ping_url.ProtocolIsInHTTPFamily())
     return;
 
-@@ -147,6 +149,7 @@ void PingLoader::SendLinkAuditPing(LocalFrame* frame,
+@@ -140,6 +142,7 @@ void PingLoader::SendLinkAuditPing(LocalFrame* frame,
 void PingLoader::SendViolationReport(ExecutionContext* execution_context,
                                      const KURL& report_url,
                                      scoped_refptr<EncodedFormData> report) {
@@ -9,7 +9,7 @@ Subject: Disable devtools remote and custom protocols
 diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
 --- a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
 +++ b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
-@@ -176,7 +176,7 @@ void DevToolsDataSource::StartDataRequest(
+@@ -175,7 +175,7 @@ void DevToolsDataSource::StartDataRequest(
   // Serve request to devtools://remote from remote location.
   std::string remote_path_prefix(chrome::kChromeUIDevToolsRemotePath);
   remote_path_prefix += "/";
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrom
                        base::CompareCase::INSENSITIVE_ASCII)) {
     if (MaybeHandleCustomRequest(path.substr(remote_path_prefix.length()),
                                  &callback)) {
-@@ -199,7 +199,7 @@ void DevToolsDataSource::StartDataRequest(
+@@ -198,7 +198,7 @@ void DevToolsDataSource::StartDataRequest(
   // Serve request to devtools://custom from custom URL.
   std::string custom_path_prefix(chrome::kChromeUIDevToolsCustomPath);
   custom_path_prefix += "/";
@@ -4,114 +4,17 @@ Subject: Disable feeds support by default

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/BUILD.gn                        |  9 +++++++++
- chrome/browser/feed/android/web_feed_bridge.cc | 18 ++++++++++++++++++
- chrome/browser/prefs/browser_prefs.cc          |  4 ++--
- components/feed/core/common/pref_names.cc      | 13 +------------
- .../feed/core/shared_prefs/pref_names.cc       |  2 +-
- components/feed/feed_feature_list.cc           |  3 +++
- 6 files changed, 34 insertions(+), 15 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc           |  4 ++--
+ components/feed/core/common/pref_names.cc       | 13 +------------
+ components/feed/core/shared_prefs/pref_names.cc |  2 +-
+ components/feed/feed_feature_list.cc            |  2 ++
+ 4 files changed, 6 insertions(+), 15 deletions(-)

-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -2663,6 +2663,15 @@ static_library("browser") {
-     ]
-   }
- 
-+  if (is_android && !enable_feed_v2) {
-+    sources += [
-+      "feed/feed_service_factory.cc",
-+      "feed/feed_service_factory.h",
-+    ]
-+    deps += [
-+      "//components/feed:feature_list",
-+    ]
-+  }
-   if (enable_feed_v2) {
-     sources += [
-       "feed/feed_service_factory.cc",
-diff --git a/chrome/browser/feed/android/web_feed_bridge.cc b/chrome/browser/feed/android/web_feed_bridge.cc
--- a/chrome/browser/feed/android/web_feed_bridge.cc
-+++ b/chrome/browser/feed/android/web_feed_bridge.cc
-@@ -24,6 +24,7 @@
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profile_manager.h"
- #include "components/country_codes/country_codes.h"
-+#include "components/feed/buildflags.h"
- #include "components/feed/core/v2/config.h"
- #include "components/feed/core/v2/public/feed_service.h"
- #include "components/feed/core/v2/public/types.h"
-@@ -80,10 +81,14 @@ base::android::ScopedJavaLocalRef<jbyteArray> ToJavaWebFeedId(
- }
- 
- WebFeedSubscriptions* GetSubscriptions() {
-+#if BUILDFLAG(ENABLE_FEED_V2)
-   Profile* profile = ProfileManager::GetLastUsedProfile();
-   if (!profile)
-     return nullptr;
-   return GetSubscriptionsForProfile(profile);
-+#else
-+  return nullptr;
-+#endif
- }
- 
- FeedApi* GetStream() {
-@@ -219,10 +224,14 @@ static void JNI_WebFeedBridge_FollowWebFeed(
-     return;
-   }
- 
-+#if BUILDFLAG(ENABLE_FEED_V2)
-   FollowWebFeed(
-       page_info.web_contents,
-       static_cast<feedwire::webfeed::WebFeedChangeReason>(change_reason),
-       std::move(callback));
-+#else
-+  std::move(callback).Run({});
-+#endif
- }
- 
- static jboolean JNI_WebFeedBridge_IsCormorantEnabledForLocale(JNIEnv* env) {
-@@ -266,11 +275,16 @@ static void JNI_WebFeedBridge_UnfollowWebFeed(
-   auto callback =
-       AdaptCallbackForJava<WebFeedSubscriptions::UnfollowWebFeedResult>(
-           env, j_callback);
-+
-+#if BUILDFLAG(ENABLE_FEED_V2)
-   UnfollowWebFeed(
-       ToNativeWebFeedId(env, webFeedId),
-       /*is_durable_request=*/is_durable,
-       static_cast<feedwire::webfeed::WebFeedChangeReason>(change_reason),
-       std::move(callback));
-+#else
-+  std::move(callback).Run({});
-+#endif
- }
- 
- static void JNI_WebFeedBridge_FindWebFeedInfoForPage(
-@@ -282,6 +296,7 @@ static void JNI_WebFeedBridge_FindWebFeedInfoForPage(
-       AdaptCallbackForJava<WebFeedMetadata>(env, j_callback);
- 
-   PageInformation page_info = ToNativePageInformation(env, pageInfo);
-+#if BUILDFLAG(ENABLE_FEED_V2)
-   // Make sure web_contents is not NULL since the user might navigate away from
-   // the current tab that is requested to find info.
-   if (!page_info.web_contents) {
-@@ -292,6 +307,9 @@ static void JNI_WebFeedBridge_FindWebFeedInfoForPage(
-       page_info.web_contents,
-       static_cast<WebFeedPageInformationRequestReason>(reason),
-       std::move(callback));
-+#else
-+  std::move(callback).Run({});
-+#endif
- }
- 
- static void JNI_WebFeedBridge_FindWebFeedInfoForWebFeedId(
 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
-@@ -2109,10 +2109,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
-   ChromeRLZTrackerDelegate::RegisterProfilePrefs(registry);
+@@ -1840,10 +1840,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+   supervised_user::RegisterProfilePrefs(registry);
 #endif
 
 -#if BUILDFLAG(ENABLE_FEED_V2)
@@ -126,7 +29,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/components/feed/core/common/pref_names.cc b/components/feed/core/common/pref_names.cc
 --- a/components/feed/core/common/pref_names.cc
 +++ b/components/feed/core/common/pref_names.cc
-@@ -107,18 +107,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -105,18 +105,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
 }
 
 void MigrateObsoleteProfilePrefsOct_2022(PrefService* prefs) {
@@ -161,18 +64,11 @@ 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
-@@ -155,10 +155,13 @@ BASE_FEATURE(kWebFeedKillSwitch,
+@@ -164,4 +164,6 @@ BASE_FEATURE(kRefreshFeedOnRestart,
+              "RefreshFeedOnRestart",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
- bool IsWebFeedEnabledForLocale(const std::string& country) {
-+  if ((true)) return false;
-   const std::vector<std::string> launched_countries = {"AU", "CA", "GB",
-                                                        "NZ", "US", "ZA"};
-   return base::Contains(launched_countries, country) &&
-          !base::FeatureList::IsEnabled(kWebFeedKillSwitch);
- }
- 
 +SET_CROMITE_FEATURE_DISABLED(kInterestFeedV2);
-+
+SET_CROMITE_FEATURE_DISABLED(kWebFeed);
 }  // namespace feed
 --
@@ -7,8 +7,7 @@ Disable reporting of Omnibox suggestions header.

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../origin_trials_component_loader.cc         |  1 +
- android_webview/common/aw_content_client.cc   |  2 ++
+ android_webview/common/aw_features.cc         |  4 +--
 android_webview/nonembedded/BUILD.gn          |  2 --
 ...eddedFastVariationsSeedSafeModeAction.java |  2 --
 ...SafeModeVariationsSeedContentProvider.java |  5 ---
@@ -28,44 +27,35 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../variations_render_thread_observer.cc      |  9 -----
 .../Disable-fetching-of-all-field-trials.inc  |  1 +
 .../renderer/core/loader/document_loader.cc   |  7 ----
- 21 files changed, 29 insertions(+), 89 deletions(-)
+ 20 files changed, 28 insertions(+), 91 deletions(-)
 create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc

-diff --git a/android_webview/browser/component_updater/origin_trials_component_loader.cc b/android_webview/browser/component_updater/origin_trials_component_loader.cc
--- a/android_webview/browser/component_updater/origin_trials_component_loader.cc
-+++ b/android_webview/browser/component_updater/origin_trials_component_loader.cc
-@@ -14,6 +14,7 @@ namespace android_webview {
+diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
+--- a/android_webview/common/aw_features.cc
+++ b/android_webview/common/aw_features.cc
+@@ -113,8 +113,8 @@ BASE_FEATURE(kWebViewJavaJsBridgeMojo,
 
- void LoadOriginTrialsComponent(
-     component_updater::ComponentLoaderPolicyVector& policies) {
-+  if ((true)) return;
-   policies.push_back(std::make_unique<OriginTrialsComponentLoaderPolicy>());
- }
+ // Field trial feature for controlling support of Origin Trials on WebView.
+ BASE_FEATURE(kWebViewOriginTrials,
+-             "WebViewOriginTrials",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "WebViewOriginTrials",                 // disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);    // by default
 
-diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
--- a/android_webview/common/aw_content_client.cc
-+++ b/android_webview/common/aw_content_client.cc
-@@ -115,6 +115,8 @@ void AwContentClient::ExposeInterfacesToBrowser(
- }
- 
- blink::OriginTrialPolicy* AwContentClient::GetOriginTrialPolicy() {
-+  if ((true)) return nullptr;
-+
-   // Prevent initialization race (see crbug.com/721144). There may be a
-   // race when the policy is needed for worker startup (which happens on a
-   // separate worker thread).
+ // Whether to record size of the embedding app's data directory to the UMA
+ // histogram Android.WebView.AppDataDirectorySize.
 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
-@@ -106,7 +106,6 @@ android_library("services_java") {
+@@ -104,7 +104,6 @@ android_library("services_java") {
+   sources = [
     "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",
 -    "java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java",
     "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",
-@@ -125,7 +124,6 @@ android_library("services_java") {
+@@ -123,7 +122,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",
@@ -152,7 +142,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc
 --- a/components/ukm/ukm_recorder_impl.cc
 +++ b/components/ukm/ukm_recorder_impl.cc
-@@ -189,6 +189,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
+@@ -164,6 +164,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map,
 
 UkmRecorderImpl::UkmRecorderImpl()
     : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -177,7 +167,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
 diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
 --- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
 +++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
-@@ -469,39 +469,13 @@ public class VariationsSeedFetcher {
+@@ -468,39 +468,13 @@ public class VariationsSeedFetcher {
      */
     public void fetchSeed(String restrictMode, String milestone, String channel) {
         assert !ThreadUtils.runningOnUiThread();
@@ -221,7 +211,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
     }
 
     private void recordFetchResultOrCode(int resultOrCode) {
-@@ -553,7 +527,7 @@ public class VariationsSeedFetcher {
+@@ -552,7 +526,7 @@ public class VariationsSeedFetcher {
      * @param curSeedInfo optional currently saved seed info to set the `If-None-Match` header.
      * @return the object holds the request result and seed data with its related header fields.
      */
@@ -311,7 +301,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -226,17 +226,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -224,17 +224,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -331,7 +321,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
-@@ -625,7 +616,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -612,7 +603,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.
@@ -344,20 +334,20 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
 --- a/content/browser/loader/url_loader_throttles.cc
 +++ b/content/browser/loader/url_loader_throttles.cc
@@ -52,8 +52,6 @@ CreateContentBrowserURLLoaderThrottles(
-   // TODO(crbug.com/40135370): Consider whether we want to use the WebContents
-   // to determine the value for variations::Owner. Alternatively, this is the
+   // TODO(crbug.com/1094303): Consider whether we want to use the WebContents to
+   // determine the value for variations::Owner. Alternatively, this is the
   // browser side, and we might be fine with Owner::kUnknown.
 -  variations::VariationsURLLoaderThrottle::AppendThrottleIfNeeded(
 -      browser_context->GetVariationsClient(), &throttles);
 
   ClientHintsControllerDelegate* client_hint_delegate =
       browser_context->GetClientHintsControllerDelegate();
-@@ -137,11 +135,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
+@@ -132,11 +130,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
       GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive(
           request, browser_context, wc_getter, frame_tree_node_id);
   variations::OmniboxURLLoaderThrottle::AppendThrottleIfNeeded(&throttles);
-  // TODO(crbug.com/40135370): Consider whether we want to use the WebContents
-  // to determine the value for variations::Owner. Alternatively, this is the
+-  // TODO(crbug.com/1094303): Consider whether we want to use the WebContents to
+-  // determine the value for variations::Owner. Alternatively, this is the
 -  // browser side, and we might be fine with Owner::kUnknown.
 -  variations::VariationsURLLoaderThrottle::AppendThrottleIfNeeded(
 -      browser_context->GetVariationsClient(), &throttles);
@@ -367,9 +357,9 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
 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
-@@ -15,7 +15,7 @@ namespace {
+@@ -14,7 +14,7 @@ namespace {
 std::vector<std::string> GetHeaderValues(
-     std::string_view header_name,
+     base::StringPiece header_name,
     const net::HttpResponseHeaders* headers) {
 -  if (!headers) {
 +  if ((true)) {
@@ -404,7 +394,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
-@@ -202,13 +202,6 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -197,13 +197,6 @@ WebVector<int> CopyInitiatorOriginTrials(
     const Vector<mojom::blink::OriginTrialFeature>&
         initiator_origin_trial_features) {
   WebVector<int> result;
@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-@@ -297,6 +297,7 @@
+@@ -280,6 +280,7 @@
     {
       name: "IdleDetection",
       permissions_policy_name: "idle-detection",
@@ -55,9 +55,9 @@ 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
-@@ -2088,6 +2088,11 @@
-       name: "IgnoresCSSTextTransformsForPlainTextCopy",
-       status: "stable",
+@@ -2054,6 +2054,11 @@
+       name: "HTMLUnsafeMethods",
+       status: "experimental",
     },
 +    {
 +      name: "IdleDetection",  // disabled
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
 --- a/components/omnibox/common/omnibox_features.cc
 +++ b/components/omnibox/common/omnibox_features.cc
-@@ -393,8 +393,8 @@ BASE_FEATURE(kOmniboxSteadyStateTextColor,
+@@ -434,8 +434,8 @@ BASE_FEATURE(kOmniboxModernizeVisualUpdate,
 // used, on non-Android platforms this is controlled through the
 // ChromeRefresh2023 flag.
 BASE_FEATURE(kUpdatedConnectionSecurityIndicators,
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -110,6 +110,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -106,6 +106,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
 }
 
 bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 #if !BUILDFLAG(IS_ANDROID)
   if (!base::FeatureList::IsEnabled(kMediaRouter))
     return false;
-@@ -152,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -147,7 +148,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                PrefRegistry::PUBLIC);
   registry->RegisterBooleanPref(
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
   registry->RegisterBooleanPref(
       media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
       true);
-@@ -223,4 +224,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
+@@ -218,4 +219,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
 
 #endif  // !BUILDFLAG(IS_ANDROID)
 
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -423,7 +423,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -425,7 +425,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
-@@ -572,6 +572,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -586,6 +586,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
   WebRuntimeFeatures::EnableBackForwardCache(
       content::IsBackForwardCacheEnabled());
 
@@ -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
-@@ -3274,14 +3274,10 @@
+@@ -3086,14 +3086,10 @@
       base_feature: "none",
     },
     {
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
 --- a/components/endpoint_fetcher/endpoint_fetcher.cc
 +++ b/components/endpoint_fetcher/endpoint_fetcher.cc
-@@ -369,7 +369,7 @@ void EndpointFetcher::OnResponseFetched(
+@@ -367,7 +367,7 @@ void EndpointFetcher::OnResponseFetched(
     }
   } else {
     std::string net_error = net::ErrorToString(net_error_code);
@@ -9,12 +9,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 .../toolbar/chrome_location_bar_model_delegate.cc  |  2 +-
 components/url_formatter/url_formatter.cc          | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ ...disable-omission-of-URL-elements-in-Omnibox.inc |  1 +
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+ create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-omission-of-URL-elements-in-Omnibox.inc

 diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
 +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
+@@ -266,5 +266,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
 // static
 void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
@@ -24,7 +26,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -534,13 +534,13 @@ bool HasTwoViewSourceSchemes(std::string_view spec) {
+@@ -533,13 +533,13 @@ bool HasTwoViewSourceSchemes(base::StringPiece spec) {
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -45,4 +47,10 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
 const FormatUrlType kFormatUrlOmitMobilePrefix = 1 << 9;
 
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-omission-of-URL-elements-in-Omnibox.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-omission-of-URL-elements-in-Omnibox.inc
+new file mode 100755
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-omission-of-URL-elements-in-Omnibox.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kAndroidVisibleUrlTruncationV2);
 --
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
uazoandGitHub	ac973e33e3	AUTOMATED - git apply results	2024-04-03 16:00:15 +00:00
uazoandGitHub	b8df90d728	AUTOMATED - git apply results	2024-04-03 15:57:51 +00:00