[TOOLS] Use correct win sdk folder for release

[AUTO] Patches auto-rebase for master branch (#2394 )
[AUTO] Patches auto-rebase for master branch
2025-10-10 09:43:43 +02:00 · 2025-10-09 09:12:52 -08:00 · 2025-10-09 17:11:38 +00:00 · 2025-10-09 17:57:05 +02:00 · 2025-10-09 06:58:09 -03:00 · 2025-10-09 09:45:53 +00:00
2675 changed files with 242838 additions and 301473 deletions
@@ -0,0 +1,14 @@
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }})
+
+{{ range .Commits -}}
+{{ if not (contains .Type "[") }}- {{.Hash.Short}} {{ .Subject }}
+{{ if not (eq (len .Body) 0) }}{{ .Body }}{{ end }}
+{{ range .Refs -}}
+{{ " " }} - #{{ .Ref }}
+{{ end }}
+{{ end }}
+{{ end }}
+
+{{ end -}}
@@ -0,0 +1,20 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/uazo/cromite
+options:
+  commits:
+    filters:
+      Type:
+        - "[AUTO]"
+  commit_groups:
+    # title_maps: []
+  header:
+    pattern: "^(\\[.*\\])?(.*)$"
+    pattern_maps:
+      - Type
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE
@@ -1 +1,2 @@
-*.zip binary
+*.zip binary
+*.pdf binary
@@ -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/docs/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."
@@ -91,10 +93,11 @@ body:
      multiple: false
      description: What version of Android are you running?
      options:
+        - Android 15
        - Android 14
        - Android 13
        - Android 12.1
-        - Android 12.0
+        - Android 12
        - Android 11
        - Android 10
        - Android 9
@@ -148,7 +151,7 @@ body:
  - type: dropdown
    id: is_incognito
    attributes:
-      label: Is this bug happening in an incognito tab?
+      label: Is this bug happening ONLY in an incognito tab?
      multiple: false
      options:
        - "Yes"
@@ -37,18 +37,41 @@ jobs:
      - name: Reclaiming disk space on / by removing dotnet/android/ghc
        #if: ${{ github.event.inputs.type == '' }}
        run: |
-          test -d /usr/share/dotnet && sudo rm -rf /usr/share/dotnet
-          test -d /usr/local/lib/android && sudo rm -rf /usr/local/lib/android
-          test -d /opt/ghc && sudo rm -rf /opt/ghc
-          test -d /opt/hostedtoolcache/CodeQL && sudo rm -rf /opt/hostedtoolcache/CodeQL
+          df -h
+
+          DIR=/usr/share/dotnet && sudo rm -rf $DIR
+          DIR=/usr/local/lib/android && sudo rm -rf $DIR
+          DIR=/opt/ghc && sudo rm -rf $DIR
+          DIR=/opt/hostedtoolcache/CodeQL && sudo rm -rf $DIR
+          DIR=/usr/local/.ghcup && sudo rm -rf $DIR
+          DIR=/usr/lib/jvm && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/julia1.10.5 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/x86_64-linux-gnu && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/gcc && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-15 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-14 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-13 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/heroku && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/swift && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/miniconda && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/az_12.1.0 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/share/powershell && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/share/chromium && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/gcc && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-15 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-14 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-13 && test -d $DIR && sudo rm -rf $DIR
+
          sudo apt-get remove google-cloud-cli azure-cli google-chrome-stable \
                       firefox mysql-server-core-8.0 mono-devel podman \
                       powershell || true
          sudo apt-get autoremove

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

+      - name: Download regctl
+        shell: bash
+        run: |
+          curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl
+          chmod 755 regctl
+      
      - name: Building build-deps container ${{ env.VERSION }}
        shell: bash
        run: |
          IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$CHR_VERSION \
                --progress plain \
@@ -106,7 +135,7 @@ jobs:
        run: |
          IS_PRESENT=$(docker inspect --type=image uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$CHR_VERSION \
                --progress plain \
@@ -156,7 +185,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -180,8 +209,10 @@ 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
@@ -189,7 +220,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
@@ -0,0 +1,267 @@
+name: Build Additional Targets
+permissions:
+  actions: none
+  checks: none
+  contents: none
+  deployments: none
+  issues: none
+  packages: none
+  pull-requests: none
+  repository-projects: none
+  security-events: none
+  statuses: none
+
+on:
+  workflow_dispatch:
+    inputs:
+      sha:
+        description: 'uazo/cromite SHA'
+        required: true
+        default: ''
+      type:
+        description: 'runner? [dev/ci]'
+        required: true
+        default: 'ci'
+      debug:
+        description: 'debug? [true/false]'
+        required: true
+        default: 'false'
+
+env:
+  CROMITE_SHA: ${{ github.event.inputs.sha }}
+  REMOVEDOCKERSUPPORT: true
+  USELOCALIMAGE: true
+
+jobs:
+  check_images:
+    runs-on: ${{ github.event.inputs.type }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          path: cromite
+          ref: ${{ github.event.inputs.sha }}
+          fetch-depth: 1
+
+      - name: Enable proxy on container
+        shell: bash
+        run: |
+          if ! [[ -z "${HTTP_PROXY}" ]]; then
+            PROXY_ADDR=http://$(hostname -I | cut -d' ' -f1 | xargs):8118
+            echo "PROXY_ADDR=$PROXY_ADDR" >> $GITHUB_ENV
+            sudo iptables -D INPUT -p tcp -s localhost --dport 8118 -j ACCEPT
+            sudo iptables -D INPUT -p tcp --dport 8118 -j DROP
+          fi
+
+      - name: Get current chromium version
+        shell: bash
+        run: |
+          export VERSION=$( cat ./cromite/build/RELEASE )
+
+          echo Current version is $VERSION
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+          cd cromite/tools
+
+      - name: Get uazo/cromite-build from docker hub if present
+        shell: bash
+        run: |
+          IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+          if [ $IS_PRESENT -eq "0" ]; then
+            docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA
+          fi
+
+      - name: Mark image to build
+        shell: bash
+        run: |
+          IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:build > /dev/null ; echo $?)
+          if [ $IS_PRESENT -eq "0" ]; then
+            docker rmi uazo/cromite-build:build
+          fi
+          docker tag uazo/cromite-build:$VERSION-$CROMITE_SHA uazo/cromite-build:build
+
+  build:
+    runs-on: ${{ github.event.inputs.type }}
+    needs: check_images
+    if: success()
+    timeout-minutes: 1440
+
+    container:
+      image: uazo/cromite-build:build
+      env:
+        REMOVEDOCKERSUPPORT: true # CUSTOM RUNNER: remove sharing of docker socket
+        USELOCALIMAGE: true       # CUSTOM RUNNER: permit use of local images
+        USEINTERNALNETWORK: true  # CUSTOM RUNNER: create the docker network as internal
+        WORKSPACE: /home/lg/working_dir
+        # kythe
+        KYTHE_CORPUS: chromium.googlesource.com/chromium/src
+        KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
+        KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/arm64/kythe
+        # cross build
+        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
+        WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
+        GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
+        # compile in debug mode
+        TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
+        USE_KEYSTORE: true
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        CROMITE_PREF_HASH_SEED_BIN: ${{ secrets.CROMITE_PREF_HASH_SEED_BIN }}
+      volumes:
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/chr_arm:/home/lg/working_dir/chromium/src/out/chr_arm
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/chr_arm64:/home/lg/working_dir/chromium/src/out/chr_arm64
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/chr_x64:/home/lg/working_dir/chromium/src/out/chr_x64
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/x64_webview:/home/lg/working_dir/chromium/src/out/x64_webview
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64_webview:/home/lg/working_dir/chromium/src/out/arm64_webview
+        - /tmp/proxy:/tmp/proxy
+        - /win_sdk:/win_sdk
+
+    steps:
+      - name: Prepare Build Container
+        shell: bash
+        run: |
+          # set workspace paths
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE
+
+          # reset proxy env
+          HTTP_PROXY=
+          HTTPS_PROXY=
+          http_proxy=
+          https_proxy=
+
+          # set out folder permissions
+          test -d chromium/src/out/chr_arm || sudo mkdir -p chromium/src/out/chr_arm && \
+            sudo chown lg chromium/src/out &&
+            sudo chown lg chromium/src/out/chr_arm
+
+          test -d chromium/src/out/chr_arm64 || sudo mkdir -p chromium/src/out/chr_arm64 && \
+            sudo chown lg chromium/src/out &&
+            sudo chown lg chromium/src/out/chr_arm64
+
+          test -d chromium/src/out/chr_x64 || sudo mkdir -p chromium/src/out/chr_x64 && \
+            sudo chown lg chromium/src/out &&
+            sudo chown lg chromium/src/out/chr_x64
+
+          test -d chromium/src/out/x64_webview || sudo mkdir -p chromium/src/out/x64_webview && \
+            sudo chown lg chromium/src/out &&
+            sudo chown lg chromium/src/out/x64_webview
+
+          test -d chromium/src/out/arm64_webview || sudo mkdir -p chromium/src/out/arm64_webview && \
+            sudo chown lg chromium/src/out &&
+            sudo chown lg chromium/src/out/arm64_webview
+            
+          sudo mkdir -p /run/user/1000/
+          sudo chown lg /run/user/1000/
+          sudo chmod g-rxw /run/user/1000/
+          sudo chmod o-rxw /run/user/1000/
+
+          # prepare keystore
+          echo "::group::-------- prepare keystore"
+          cd $WORKSPACE
+          echo "${{ secrets.KEYSTORE }}" > cromite.keystore.asc
+          gpg --homedir ./ -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch cromite.keystore.asc > cromite.keystore
+          echo "::endgroup::"
+
+      - name: Build Cromite System WebView x64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" target_cpu = \"x64\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) system_webview_package_name=\"com.android.webview\" enable_trybot_verification=false " out/x64_webview
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/x64_webview/ --list --short
+          gn args out/x64_webview/ --list >out/x64_webview/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/x64_webview system_webview_apk system_webview_shell
+          cp ../../cromite/build/RELEASE out/x64_webview
+
+      - name: Build Cromite System WebView arm64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" target_cpu = \"arm64\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) system_webview_package_name=\"com.android.webview\" enable_trybot_verification=false " out/arm64_webview
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/arm64_webview/ --list --short
+          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/arm64_webview system_webview_apk system_webview_shell
+          cp ../../cromite/build/RELEASE out/arm64_webview
+
+      - name: Prepare Build Container for vanilla chromium
+        shell: bash
+        run: |
+          # set workspace paths
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          # checkout chromium commit
+          LAST_PATCH=$(git log --all --grep='Fix-chromium-vanilla.patch' --format="%H")
+          git checkout $LAST_PATCH
+
+      - name: Build Chromium Vanilla Android x64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"x64\" " out/chr_x64
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_x64/ --list --short
+          gn args out/chr_x64/ --list >out/chr_x64/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_x64 chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_x64
+
+      - name: Build Chromium Vanilla Android arm64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"arm64\" " out/chr_arm64
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_arm64/ --list --short
+          gn args out/chr_arm64/ --list >out/chr_arm64/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_arm64 chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_arm64
+
+      - name: Build Chromium Vanilla Android arm
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"arm\" " out/chr_arm
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_arm/ --list --short
+          gn args out/chr_arm/ --list >out/chr_arm/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_arm chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_arm
@@ -65,6 +65,12 @@ jobs:
            sudo iptables -D INPUT -p tcp --dport 8118 -j DROP
          fi

+      - name: Download regctl
+        shell: bash
+        run: |
+          curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl
+          chmod 755 regctl
+
      - name: Get current chromium version
        shell: bash
        run: |
@@ -78,9 +84,10 @@ jobs:
      - name: Building build-deps container ${{ env.VERSION }}
        shell: bash
        run: |
+          docker pull uazo/build-deps:$VERSION || true
          IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/build-deps:$VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/build-deps:$VERSION > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$VERSION \
                --progress plain \
@@ -94,9 +101,10 @@ jobs:
      - name: Building chromium container ${{ env.VERSION }}
        shell: bash
        run: |
+          docker pull uazo/chromium:$VERSION || true
          IS_PRESENT=$(docker inspect --type=image uazo/chromium:$VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/chromium:$VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/chromium:$VERSION > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$VERSION \
                --progress plain \
@@ -109,9 +117,10 @@ jobs:
      - name: Building cromite container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
        shell: bash
        run: |
+          docker pull uazo/cromite:$VERSION-$CROMITE_SHA || true
          IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/cromite:$VERSION-$CROMITE_SHA --progress plain \
                --build-arg CROMITE_SHA=$CROMITE_SHA \
@@ -124,9 +133,10 @@ jobs:
      - name: Building cromite-build container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
        shell: bash
        run: |
+          docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA || true
          IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
            if [ $IS_PRESENT -ne "0" ]; then
              DOCKER_BUILDKIT=1 docker build -t uazo/cromite-build:$VERSION-$CROMITE_SHA --progress plain \
                --build-arg CROMITE_SHA=$CROMITE_SHA \
@@ -140,7 +150,7 @@ jobs:
      - name: Get uazo/cromite-build from docker hub if present
        shell: bash
        run: |
-          IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+          IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
          if [ $IS_PRESENT -eq "0" ]; then
            docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA
          fi
@@ -171,10 +181,10 @@ jobs:
        KYTHE_CORPUS: chromium.googlesource.com/chromium/src
        KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
        KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/arm64/kythe
-        # cross build
-        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
-        WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
-        GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
+        # cross build (change also release.yaml)
+        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.26100.0/
+        WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.26100.0/Windows Kits/10/"
+        GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.26100.0/
        # compile in debug mode
        TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
        TARGET_OS: ${{ github.event.inputs.target_os }}
@@ -240,6 +250,9 @@ jobs:
          gpg --homedir ./ -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch cromite.keystore.asc > cromite.keystore
          echo "::endgroup::"

+          # bootstrap python3 for gn
+          echo ../../../../../usr/bin >$WORKSPACE/depot_tools/python3_bin_reldir.txt
+
      - name: Build Cromite Android x64
        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
        shell: bash
@@ -421,5 +434,5 @@ jobs:
            gn gen --args="import(\"/home/lg/working_dir/cromite/build/cromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
            $WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \
              -t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
-            /home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \
+            /home/lg/working_dir/clangd_snapshot_20250518/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \
            rm -rf out/clangd
@@ -138,7 +138,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -1,9 +1,6 @@
 name: 'Check NIST database'

 on:
-  schedule:
-    - cron: '30 1 * * *'
-
  workflow_dispatch:

 permissions:
@@ -56,7 +53,7 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
@@ -17,11 +17,15 @@ on:
        description: 'draft? [true/false]'
        required: true
        default: 'false'
+      comment:
+        description: 'comment'
+        required: true
        
 env:
  CROMITE_SHA: ${{ github.event.inputs.sha }}
  REMOVEDOCKERSUPPORT: true
  USELOCALIMAGE: true
+  COMMENT: ${{ github.event.inputs.comment }}

 jobs:
  release:
@@ -48,9 +52,6 @@ jobs:
          BRANCH=$(curl https://github.com/uazo/cromite/branch_commits/$CROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
          echo "BRANCH=$BRANCH" >> $GITHUB_ENV

-          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
-          tar xfz gh_2.18.1_linux_amd64.tar.gz
-
      - name: Checkout 'uazo/cromite'
        uses: actions/checkout@v2
        with:
@@ -71,10 +72,7 @@ jobs:

          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token

-          echo "\`\`\`" >note
-          # echo "this is not the official release of bromite but a test version." >>note
-          # echo "you can try it at your own risk." >>note
-          echo "\`\`\`" >>note
+          echo $COMMENT >note

          $GH release create $VERSION-$CROMITE_SHA --notes-file note -d

@@ -132,7 +130,7 @@ jobs:
          cp $OUTPUTFILE_WIN/chrome_proxy.exe chrome-win/
          cp $OUTPUTFILE_WIN/chrome_pwa_launcher.exe chrome-win/
          cp $OUTPUTFILE_WIN/chrome_wer.dll chrome-win/
-          cp "/win_sdk/10.0.22621.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
+          cp "/win_sdk/sdks/Win11SDK_10.0.26100.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
          cp $OUTPUTFILE_WIN/elevation_service.exe chrome-win/
          cp "$OUTPUTFILE_WIN/First Run" chrome-win/
          cp $OUTPUTFILE_WIN/headless_lib_data.pak chrome-win/
@@ -140,7 +138,6 @@ jobs:
          cp $OUTPUTFILE_WIN/libEGL.dll chrome-win/
          cp $OUTPUTFILE_WIN/libGLESv2.dll chrome-win/
          cp $OUTPUTFILE_WIN/Logo.png chrome-win/
-          cp $OUTPUTFILE_WIN/mojo_core.dll chrome-win/
          cp $OUTPUTFILE_WIN/notification_helper.exe chrome-win/
          cp $OUTPUTFILE_WIN/resources.pak chrome-win/
          cp $OUTPUTFILE_WIN/SmallLogo.png chrome-win/
@@ -179,6 +176,7 @@ jobs:
          cp $OUTPUTFILE_LIN/snapshot_blob.bin chrome-lin/
          cp $OUTPUTFILE_LIN/xdg-mime chrome-lin/
          cp $OUTPUTFILE_LIN/xdg-settings chrome-lin/
+          cp $OUTPUTFILE_LIN/chrome_sandbox chrome-lin/

          tar -czvf chrome-lin64.tar.gz chrome-lin/

@@ -203,7 +201,4 @@ jobs:
            $GH release edit $VERSION-$CROMITE_SHA --draft=false
          fi

-          VERSION=$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
-          docker push uazo/cromite:$VERSION-$CROMITE_SHA
-          docker push uazo/cromite-build:$VERSION-$CROMITE_SHA

@@ -0,0 +1,112 @@
+name: Release Additional Targets
+permissions:
+  contents: write
+
+on:
+  workflow_dispatch:
+    inputs:
+      sha:
+        description: 'uazo/cromite SHA'
+        required: true
+        default: ''
+      type:
+        description: 'runner? [dev/ci]'
+        required: true
+        default: 'ci'
+        
+env:
+  CROMITE_SHA: ${{ github.event.inputs.sha }}
+  REMOVEDOCKERSUPPORT: true
+  USELOCALIMAGE: true
+
+jobs:
+  release:
+    runs-on: ${{ github.event.inputs.type }}
+    env:
+      IS_DRAFT: ${{ github.event.inputs.draft }}
+      OUTPUTFILE_ARM64: /storage/images/${{ github.event.inputs.sha }}/android/false/arm64_webview/
+      OUTPUTFILE_X64: /storage/images/${{ github.event.inputs.sha }}/android/false/x64_webview/
+      OUTPUTFILE_CHR_ARM64: /storage/images/${{ github.event.inputs.sha }}/android/false/chr_arm64/
+      OUTPUTFILE_CHR_ARM: /storage/images/${{ github.event.inputs.sha }}/android/false/chr_arm/
+      OUTPUTFILE_CHR_X64: /storage/images/${{ github.event.inputs.sha }}/android/false/chr_x64/
+
+    steps:
+      - name: Prepare container
+        run: |
+          wget https://github.com/ericchiang/pup/releases/download/v0.4.0/pup_v0.4.0_linux_amd64.zip
+          unzip pup_v0.4.0_linux_amd64.zip && rm pup_v0.4.0_linux_amd64.zip
+          BRANCH=$(curl https://github.com/uazo/cromite/branch_commits/$CROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Checkout 'uazo/cromite'
+        uses: actions/checkout@v2
+        with:
+            repository: 'uazo/cromite'
+            path: 'cromite'
+            fetch-depth: 1
+
+      - name: Create release
+        shell: bash
+        run: |          
+          VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
+
+          cd cromite/tools
+
+          GH=gh_2.21.1_linux_amd64/bin/gh
+          wget https://github.com/cli/cli/releases/download/v2.21.1/gh_2.21.1_linux_amd64.tar.gz
+          tar xfz gh_2.21.1_linux_amd64.tar.gz
+
+          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
+
+          # android arm64
+          echo "::group::-------- android systemwebview arm64"
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebView.apk arm64_SystemWebView.apk
+          sudo chown runner arm64_SystemWebView.apk
+
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebViewShell.apk arm64_SystemWebViewShell.apk
+          sudo chown runner arm64_SystemWebViewShell.apk
+
+          echo Uploading arm64_SystemWebView
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebView.apk
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebViewShell.apk
+          echo "::endgroup::"
+
+          # android x64
+          echo "::group::-------- android systemwebview x64"
+          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebView.apk x64_SystemWebView.apk
+          sudo chown runner x64_SystemWebView.apk
+
+          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebViewShell.apk x64_SystemWebViewShell.apk
+          sudo chown runner x64_SystemWebViewShell.apk
+
+          echo Uploading x64_SystemWebView
+          $GH release upload $VERSION-$CROMITE_SHA x64_SystemWebView.apk
+          $GH release upload $VERSION-$CROMITE_SHA x64_SystemWebViewShell.apk
+          echo "::endgroup::"
+
+          # vanilla chromium arm
+          echo "::group::-------- vanilla chromium arm"
+          sudo cp ${{ env.OUTPUTFILE_CHR_ARM }}/apks/ChromePublic.apk arm_VanillaChromium.apk
+          sudo chown runner arm_VanillaChromium.apk
+
+          echo Uploading arm_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA arm_VanillaChromium.apk
+          echo "::endgroup::"
+
+          # vanilla chromium arm64
+          echo "::group::-------- vanilla chromium arm64"
+          sudo cp ${{ env.OUTPUTFILE_CHR_ARM64 }}/apks/ChromePublic.apk arm64_VanillaChromium.apk
+          sudo chown runner arm64_VanillaChromium.apk
+
+          echo Uploading arm64_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA arm64_VanillaChromium.apk
+          echo "::endgroup::"
+
+          # vanilla chromium x64
+          echo "::group::-------- vanilla chromium x64"
+          sudo cp ${{ env.OUTPUTFILE_CHR_X64 }}/apks/ChromePublic.apk x64_VanillaChromium.apk
+          sudo chown runner x64_VanillaChromium.apk
+
+          echo Uploading x64_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA x64_VanillaChromium.apk
+          echo "::endgroup::"
@@ -67,14 +67,14 @@ jobs:
          fi

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
        if: env.CHANGES == '1'
        with:
          token: ${{ secrets.CROMITE_PULLS }}
          path: cromite
          base: ${{ env.BRANCH }}
          add-paths: |
-            build/patches/*.patch
+            docs/*.md
          commit-message: '[AUTO][DOC] Generate patches doc for master branch'
          title: '[AUTO][DOC] Generate patches doc for master branch'
          body: ${{ env.MESSAGE }}
@@ -2,6 +2,11 @@ name: Update fdroid repo

 on:
  workflow_dispatch:
+    inputs:
+      type:
+        description: 'runner? [dev/ci]'
+        required: true
+        default: 'ci'

 env:
  REMOVEDOCKERSUPPORT: true
@@ -10,7 +15,7 @@ env:

 jobs:
  update-fdroid:
-    runs-on: ci2
+    runs-on: ${{ github.event.inputs.type }}

    container:
      image: uazo/fdroidserver:latest
@@ -27,9 +32,11 @@ jobs:
            touch /etc/apt/apt.conf.d/proxy.conf
            echo "Acquire::http::Proxy \"$https_proxy\";" >/etc/apt/apt.conf.d/proxy.conf

+            cd /
+            . fdroidserver-env/bin/activate
            apt update

-            DEBIAN_FRONTEND=noninteractive apt update && apt install -y wget
+            DEBIAN_FRONTEND=noninteractive apt update && apt install -y wget unzip
            wget https://github.com/rclone/rclone/releases/download/v1.64.0/rclone-v1.64.0-linux-amd64.zip
            unzip rclone-v1.64.0-linux-amd64.zip
            export rclone=rclone-v1.64.0-linux-amd64/rclone
@@ -14,7 +14,7 @@

 Cromite is a [Chromium](https://www.chromium.org/Home) fork based on [Bromite](https://github.com/bromite/bromite) with built-in support for ad blocking and an eye for privacy.

-Cromite is available for Android arm64-v8a, arm32-v7a and x86_64, Nougat and above (Minimum v7.0, API level 24), Windows and Linux 64bit.
+Cromite is available for Android arm64-v8a, arm32-v7a and x86_64, Android 10 and above, Windows and Linux 64bit.

 # Goals

@@ -27,12 +27,13 @@ In addition, Cromite would like to promote greater integration with other non-pr

 # Privacy limitations

-Cromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases.
+Cromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases (better to use the desktop version).
 Please note that this project is not free of bugs and that changing the behaviour of a browser can be risky and not without problems.

 # Docs
 - [Privacy Policy](https://github.com/uazo/cromite/blob/master/docs/PRIVACY_POLICY.md)
 - [Features](https://github.com/uazo/cromite/blob/master/docs/FEATURES.md)
+- [Faqs](https://github.com/uazo/cromite/blob/master/docs/FAQ.md)
 - [How to build](https://github.com/uazo/cromite/blob/master/docs/HOW_TO_BUILD.md)
 - [Patch list](https://github.com/uazo/cromite/blob/master/docs/PATCHES.md)

@@ -40,16 +41,58 @@ Please note that this project is not free of bugs and that changing the behaviou

 All built versions are available as [releases](https://github.com/uazo/cromite/releases).

-Cromite is currently built for ARM64, x86 (Android SDK version 23+) and Windows x64.
+Cromite is currently built for ARM, ARM64, Android x86, Windows x64 and Linux.

-You will automatically receive notifications about new updates (and be able to install them) via the auto updater functionality (enabled by default), see [related wiki page](https://github.com/bromite/bromite/wiki/AutomaticUpdates).
+The following files will be present for each release:
+
+#### Cromite apk for android:
+- [arm64_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/arm64_ChromePublic.apk)
+- [arm_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/arm_ChromePublic.apk)
+- [x64_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/x64_ChromePublic.apk)
+
+#### Linux package:
+- [chrome-lin64.tar.gz](https://github.com/uazo/cromite/releases/latest/download/chrome-lin64.tar.gz)
+
+#### Windows package:
+- [chrome-win.zip](https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip)
+
+#### Debugging symbols and proguard file for java stacktrace deobfuscation
+- x64_ChromePublic.apk.mapping
+- arm64_ChromePublic.apk.mapping
+- arm64_symbols.zip
+
+#### Build time analysis file:
+- arm64_ninja_log_trace.html
+
+#### Chrlauncher autoupdate file:
+- updateurl.txt
+
+Additional files are also available: please note that these files are created by an [additional build](https://github.com/uazo/cromite/actions/workflows/build_additional_targets.yaml) separate from the release process, and therefore may not be immediately available.
+
+#### Cromite System WebView apk for android:
+- arm64_SystemWebView.apk
+- x64_SystemWebView.apk
+
+#### Vanilla Chromium for android (used for tests):
+- arm64_VanillaChromium.apk
+- arm_VanillaChromium.apk
+- x64_VanillaChromium.apk
+
+#### SystemWebView Shell (used for tests)
+- arm64_SystemWebViewShell.apk
+- x64_SystemWebViewShell.apk

 ### F-droid

 Official F-droid repo url:
 https://www.cromite.org/fdroid/repo/?fingerprint=49F37E74DEE483DCA2B991334FB5A0200787430D0B5F9A783DD5F13695E9517B

-### Auto-update setup for windows
+### Auto-update in Android
+
+You will automatically receive notifications about new updates (and be able to install them) via the auto updater functionality.
+You will be asked whether you want to activate the functionality during the first start-up.
+
+### Auto-update setup for Windows

 1. Download https://github.com/henrypp/chrlauncher/releases
 2. Create a `chrlauncher.ini`
@@ -63,7 +106,7 @@ ChromiumUpdateUrl=https://github.com/uazo/cromite/releases/latest/download/updat
 # Command line for Chromium (string):
 # note --user-data-dir= works better if path is absolute
 # See here: http://peter.sh/experiments/chromium-command-line-switches/
-ChromiumCommandLine=--user-data-dir="C:\Users\<my user>\AppData\Local\Chromium\User Data" --no-default-browser-check
+ChromiumCommandLine=--user-data-dir="%LOCALAPPDATA%\Cromite\User Data" --no-default-browser-check

 # to enable full logging in c:\temp\log.txt (daily rotate, no automatic deletion)
 # ChromiumCommandLine=--enable-logging --v=0 --log-file=C:\temp\log.txt --user-data-dir=".\User Data" --no-default-browser-check
@@ -86,7 +129,7 @@ icacls . /grant "*S-1-15-2-2:(OI)(CI)(RX)"
 see https://github.com/uazo/bromite-buildtools/issues/51

 ### Enable AppContainer for renderer process in windows
-you can activate the 'RendererAppContainer' flag from the command line with
+you can activate (highly recommended) the 'RendererAppContainer' flag from the command line with
 ```
  --enable-features=RendererAppContainer
 ```
@@ -94,6 +137,29 @@ you can activate the 'RendererAppContainer' flag from the command line with
 ### Auto-update setup for linux
 working in progress in https://github.com/uazo/cromite/issues/771

+### 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.
+
 # Contributing

 Please submit issues following the issue template; beware that GitHub does not display the templates from mobile.
@@ -117,6 +183,17 @@ For any usage or development discussion please use GitHub Discussions: https://g

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

+# Donate
+
+If you want, you can donate to support cromite development through [paypal](https://www.paypal.com/pools/c/9e5lO2OIzb).
+
+Current link:
+- https://www.paypal.com/pools/c/9hEHZ6tElk
+
+Historical fundraisings links:
+- https://www.paypal.com/pools/c/9cwNgAQhRL
+- https://www.paypal.com/pools/c/9e5lO2OIzb
+
 # License

 Cromite is published under [GNU GPL v3](./LICENSE).
@@ -1 +1 @@
-125.0.6422.113
+141.0.7390.70
@@ -0,0 +1,9 @@
+# infra/config/generated/builders/ci/android-official/gn-args.json
+debuggable_apks = false
+is_official_build = true
+
+# the official instructions use symbol_level=2 but I do not need the debug symbols
+symbol_level = 0
+
+# do not make the second build of v8
+include_both_v8_snapshots = false
@@ -0,0 +1,36 @@
+)]}'
+{
+	"response": {
+		"server": "prod",
+		"protocol": "3.1",
+		"app": [
+			{
+				"appid": "gcmjkmgdlgnkkcocmoeiminaijmmjnii",
+				"status": "ok",
+				"updatecheck": {
+					"status": "ok",
+					"urls": {
+						"url": [
+							{
+								"codebase": "https://www.cromite.org/components/"
+							}
+						]
+					},
+					"manifest": {
+						"version": "1.0.0",
+						"packages": {
+							"package": [
+								{
+									"hash_sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482",
+									"name": "fonts_component.zip",
+									"fp": "1.22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482",
+									"required": true
+								}
+							]
+						}
+					}
+				}
+			}
+		]
+	}
+}
@@ -0,0 +1,32 @@
+)]}' {
+	"response": {
+		"server": "prod",
+		"protocol": "4.0",
+		"apps": [
+			{
+				"appid": "gcmjkmgdlgnkkcocmoeiminaijmmjnii",
+				"status": "ok",
+				"updatecheck": {
+					"status": "ok",
+					"nextversion": "1.0.0",
+					"pipelines": [
+						{
+							"operations": [
+								{
+									"type": "download",
+									"urls": [ { "url": "https://www.cromite.org/components/fonts_component.zip" } ],
+									"out": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" },
+									"size": 60716451
+								},
+								{
+									"type": "crx3",
+									"in": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" }
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	}
+}
@@ -4,11 +4,7 @@ build_contextual_search=false
 build_with_tflite_lib=false
 chrome_pgo_phase=0
 dcheck_always_on=false
-debuggable_apks=false
-dfmify_dev_ui=false
-disable_android_lint=true
 disable_fieldtrial_testing_config=true
-enable_gvr_services=false
 enable_hangout_services_extension=false
 enable_iterator_debugging=false
 enable_mdns=false
@@ -28,12 +24,9 @@ use_debug_fission=true
 use_errorprone_java_compiler=false
 use_official_google_api_keys=false
 use_rtti=false
-use_sysroot=false
 webview_includes_weblayer=false
 enable_arcore=false
 enable_openxr=false
-enable_gvr_services=false
-enable_feed_v2=false
 enable_cardboard=false
 is_high_end_android=true

@@ -73,17 +66,10 @@ if (target_os == "android" || target_os == "win") {
 enable_platform_dts_audio = false
 enable_passthrough_audio_codecs = false

-# Do not compile libmonochrome.so with RELR relocations
-# since supported only on API 28+
-use_relr_relocations=false
-
 # disabled the use of the context snapshot
 # see https://github.com/uazo/cromite/pull/317 for context
 use_v8_context_snapshot = false

-# enable libjxl support by default
-enable_jxl_decoder = true
-
 # disable minikin engine
 # see https://github.com/uazo/cromite/issues/697
 use_minikin_hyphenation = false
@@ -92,6 +78,16 @@ use_minikin_hyphenation = false
 # initial commit: https://source.chromium.org/chromium/chromium/src/+/fd9a841f7a63b9f5510f6b713d9c833d259c63ad
 enable_bound_session_credentials = false

+# Allows building without //third_party/unrar included, for license reasons
+safe_browsing_use_unrar = false
+
+# Keep disabled Google Request Header Integrity
+# see https://chromium-review.googlesource.com/c/chromium/src/+/5778493
+enable_request_header_integrity = false
+
+# Disable precompiled headers because they are incompatible with the unsafe_buffers configuration
+enable_precompiled_headers = false
+
 declare_args() {
  _is_debug_build = ""
  build_webview = false
@@ -99,10 +95,6 @@ declare_args() {

 not_needed(["_target_build", "_is_debug_build"])

-if (getenv("TARGET_CPU") != "") {
-  target_cpu = getenv("TARGET_CPU")
-}
-
 if (target_os == "android") {
  target_os = "android" # fix traffic annotation auditor
  #enable_kythe_annotations = true
@@ -111,6 +103,11 @@ 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
+
+  # do not split Developer UI split into a separate Dynamic Feature Module
+  dfmify_dev_ui = false
+
  if (getenv("USE_KEYSTORE") != "") {
    android_keystore_path = "/home/lg/working_dir/cromite.keystore"
    android_keystore_name = "cromite"
@@ -119,8 +116,10 @@ if (target_os == "android") {

  cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")

+  disable_android_lint = true
+
  _is_debug_build = getenv("TARGET_ISDEBUG")
-  if(_is_debug_build == "true") {
+  if (_is_debug_build == "true") {
    # print("Debug build on")
    is_debug = true
    is_official_build = false
@@ -128,13 +127,23 @@ if (target_os == "android") {
    symbol_level = 1
    strip_debug_info = false
    generate_linker_map = false
+
+    # Disable static analysis
+    android_static_analysis = "off"
+
+    # Turns off all V8 debug features. Disables running V8 in a pseudo debug mode
+    # bypass build error -5 in clang_x64/mksnapshot
+    v8_enable_debugging_features = false
+    v8_dcheck_always_on = false
  } else {
+    include_both_v8_snapshots = false
+    include_both_v8_snapshots_android_secondary_abi = false
    generate_linker_map = true
  }

  if (build_webview) {
-    # only 64bit
-    skip_secondary_abi_for_cq = true
+    # 32 and 64bit
+    skip_secondary_abi_for_cq = false
  }
 }

@@ -1,7 +1,14 @@
+Do-not-link-with-libatomic.patch
+Do-not-check-for-the-presence-of-use-remoteexec.patch
 bromite-build-utils.patch
+Add-cromite-flags-support.patch
+Force-use-vpython3-for-some-scripts.patch
+Permit-PGO-for-debug-builds.patch
+Fix-chromium-vanilla.patch
+Final-patch-for-chromium-vanilla.patch
+Restore-chrome-password-store.patch
 Remove-EV-certificates.patch
 do-not-hide-.orig-files.patch
-Do-not-link-with-libatomic.patch
 do-not-add-suffix-to-package-name.patch
 exit-on-failure-of-inclusion.patch
 Move-some-account-settings-back-to-privacy-settings.patch
@@ -20,8 +27,7 @@ Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
 disable-battery-status-updater.patch
 Battery-API-return-nothing.patch
-updater-disable-updater-pings.patch
-Disable-omission-of-URL-elements-in-Omnibox.patch
+Disable-omission-of-URL-elements.patch
 Modify-default-preferences.patch
 Do-not-store-passwords-by-default.patch
 Disable-NTP-remote-suggestions-by-default.patch
@@ -34,14 +40,10 @@ ungoogled-chromium-Disable-translate-integration.patch
 ungoogled-chromium-Disable-profile-avatar.patch
 ungoogled-chromium-Disable-intranet-detector.patch
 ungoogled-chromium-no-special-hosts-domains.patch
-ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
 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
 Add-exit-menu-item.patch
@@ -50,6 +52,7 @@ 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,11 +60,10 @@ 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-FLoC-and-privacy-sandbox.patch
+Disable-privacy-sandbox.patch
 History-number-of-days-privacy-setting.patch
 Disable-fetching-of-all-field-trials.patch
 Disable-plugins-enumeration.patch
-net-cert-increase-default-key-length.patch
 dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
 Add-flag-to-disable-IPv6-probes.patch
 profile-resetter-disable-send-settings.patch
@@ -69,8 +71,6 @@ Do-not-build-API-keys-infobar.patch
 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
@@ -93,12 +93,9 @@ Disable-feeds-support-by-default.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
 Guard-for-user-agent-reduction.patch
-AImageReader-CFI-crash-mitigations.patch
 Add-menu-item-to-view-source.patch
 Revert-removal-of-execution-context-address-space.patch
 Block-gateway-attacks-via-websockets.patch
-Enable-prefetch-privacy-changes-by-default.patch
-Disable-support-for-RAR-files-inspection.patch
 Enable-darken-websites-checkbox-in-themes.patch
 Remove-blocklisted-URLs-upon-bookmark-creation.patch
 Disable-the-DIAL-repeating-discovery.patch
@@ -120,7 +117,6 @@ User-agent-customization.patch
 Add-AllowUserCertificates-flag.patch
 Add-IsCleartextPermitted-flag.patch
 Add-flag-for-omnibox-autocomplete-filtering.patch
-Revert-Delete-block-external-form-redirects.patch
 Add-flag-to-disable-external-intent-requests.patch
 Enable-share-intent.patch
 Logcat-crash-reports-UI.patch
@@ -128,7 +124,6 @@ Add-flag-to-disable-vibration.patch
 mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
 Client-hints-overrides.patch
 Allow-building-without-enable_reporting.patch
-Disable-lock-icon-in-address-bar-by-default.patch
 Experimental-user-scripts-support.patch
 Keep-empty-tabs-between-sessions.patch
 Disable-third-party-origin-trials.patch
@@ -171,18 +166,14 @@ sharing-hub-always-use-visible-URL.patch
 Enable-HEVC-by-default.patch
 Partition-blobs-by-top-frame-URL.patch
 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

 WIN-enable-pdf-plugin.patch
 WIN-disable-annotate-downloads.patch
-WIN-enable-HighEfficiencyMode-by-default.patch
-WIN-enable-file-system-access-blocklist.patch
+Enable-HighEfficiencyMode-by-default.patch
 WIN-Disable-TabHoverCard-images.patch
 WIN-Fix-log-to-file.patch
 WIN-Disable-updater.patch
@@ -191,16 +182,13 @@ WIN-Add-some-prefs-to-secure-preferences.patch
 WIN-Disable-search-for-image.patch

 AudioBuffer-AnalyserNode-fp-mitigations.patch
-Disable-Component-Updates.patch
 add-browser-policy.patch
 Always-open-browser-controls-in-new-tab.patch
 Partitioning-all-cookies-by-top-frame-domain.patch
 Disable-FedCm.patch
 Disable-BackForwardCache.patch
-Evict-the-entire-FrameTree-like-desktop.patch
 Disable-visited-pseudo-class.patch
 Add-setting-to-clear-data-on-exit.patch
-WIN-Disable-sharing-hub.patch
 Improve-the-browser-sandbox.patch
 Disable-csp-reports.patch
 Fonts-fingerprinting-mitigation.patch
@@ -219,14 +207,11 @@ 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
 Disallowing-MIDI-permission-by-default.patch
 Disable-Compression-Dictionary-Transport.patch
 Disallow-Android-App-Scheme-as-referrer.patch
-Deprecate-Data-URL-in-SVGUseElement.patch
 Content-settings-infrastructure.patch
 Add-autoplay-site-setting.patch
 Site-setting-for-images.patch
@@ -252,22 +237,17 @@ Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch
 allow-the-download-of-clang-for-windows-crossbuild.patch
 Add-option-to-disable-snapshots.patch
 Enable-Android-Dynamic-Performance-Framework.patch
-Remove-GoogleAccountsPrivateApiHost.patch
 Fix-crash-on-customize-profile-ui.patch
 Enable-ImprovedBookmarks-by-default.patch
 Partition-MediaDeviceId-by-default.patch
 Keep-disabled-FetchLaterAPI.patch
 Disable-ranker-url-fetcher.patch
-Show-full-urls-for-bookmark.patch
 Disable-prefers-reduced-transparency-media-query.patch
-libjxl-0-8-2.patch
-Add-support-to-jxl.patch
 Block-Intents-While-Locked.patch
 Keep-Manta-Service-Disabled.patch
 Disable-Service-and-Shared-workers-on-3P-iframe.patch
 Disable-Real-Box.patch
 Always-allow-inspect-fallback.patch
-Add-cromite-flags-support.patch
 Add-PartialLowEndModeOnMidRangeDevices-flag.patch
 Use-list-mode-for-tab-switcher.patch
 Chrome-web-store-protection.patch
@@ -279,7 +259,6 @@ Enable-gwp-asan-on-Android.patch
 Disable-Read-Aloud-by-default.patch
 Disable-Compose-feature.patch
 Disable-offline-autofetch-flag.patch
-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
@@ -293,17 +272,56 @@ 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
+Disable-support-for-pointer-device-id.patch
+Disable-CSS-blink-feature-support.patch
+Close-Sessions-On-Ip-Change.patch
+Ask-for-restart-on-connection-change.patch
+Bubble-Locking-on-UI-DevTools.patch
+Add-a-GN-flag-to-disable-trybot-verification.patch
+Override-the-MV2-deprecation.patch
+Remove-sideloading-of-version-dll.patch
+Use-browser-navigation-handler.patch
+Cromite-Branding--improve-settings-ui.patch
+Disable-Posture-API.patch
+PublicKeyCredential-fingerprinting-mitigations.patch
+Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
+Enable-Cert-Management-UI.patch
+Enable-ProcessBoundStringEncryption-by-default.patch
+Prevent-mouse-wheel-fingerprinting-on-Windows.patch
+Enable-component-updater.patch
+Android-fonts-fingerprinting-mitigation.patch
+Disable-Android-Tab-Declutter.patch
+Disable-CSSDynamicRangeLimit.patch
+Disable-prefers-reduced-motion.patch
+Disable-css-preferred-text-scale.patch
+Disable-Viewport-Segments.patch
+Keep-disabled-cache-sharing-for-pervasive-scripts.patch
+High-Resolution-Timing-Mitigation.patch
+Enable-snackbar-swipe.patch
+Add-cromite-test-support.patch
+Android-Pixel-Perfect-Mode.patch
+Set-caret-blink-interval-to-default.patch
+Set-the-screen-frame-rate-to-60-Hz.patch
+Disable-Device-Attributes-API.patch
+Add-setting-to-enable-Credman-for-passkeys.patch
+Temp-disable-UseContextSnapshot.patch

+# temporary or wip patches
 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
+Temp-disable-experimental-web-platform-features.patch
+Block-leakage-of-urls-in-sandbox-iframes.patch
 Fix-chromium-build-bugs.patch
+Try-to-fix-2082.patch

-eyeo-beta-118.0.5993.48-base.patch
-eyeo-beta-118.0.5993.48-chrome_integration.patch
-eyeo-beta-118.0.5993.48-android_api.patch
-eyeo-beta-118.0.5993.48-android_settings.patch
-eyeo-beta-118.0.5993.48-extension_api.patch
-Eyeo-Adblock-Remove-Privacy-Issues.patch
+# adblock patches
+eyeo-133.0.6943.49-base.patch
+eyeo-133.0.6943.49-chrome_integration.patch
+eyeo-133.0.6943.49-android_api.patch
+eyeo-133.0.6943.49-android_settings.patch
+eyeo-133.0.6943.49-extension_api.patch
+Eyeo-Adblock-for-Cromite.patch
@@ -1,262 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 5 May 2020 07:22:20 +0200
-Subject: AImageReader CFI crash mitigations
-
-Revert "gpu/android: Remove setup for disabling AImageReader."
-This reverts commit dcd5a39518246eb999f1cc63bf1ec95d93fd5b2f.
-
-Revert "Remove flags to enable/disable AImageReader."
-This reverts commit 463fa0f2e3b9e418bc26e2c8954463f0b0f76634.
-
-Restore GPU bug blacklist for AImageReader on ARM and Qualcomm CPUs
-
-Restore the AImageReader blacklist for ARM/Qualcomm chipsets which causes
-crashes on Android 9 and 10 (at different code locations).
-
-See discussions at:
-* https://github.com/bromite/bromite/issues/445
-* https://github.com/bromite/bromite/issues/814
-* https://github.com/bromite/bromite/issues/1005
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- base/android/android_image_reader_compat.cc      | 16 ++++++++++++++++
- base/android/android_image_reader_compat.h       | 14 ++++++++++++++
- chrome/browser/flag-metadata.json                |  6 +++---
- .../AImageReader-CFI-crash-mitigations.inc       |  4 ++++
- .../AImageReader-CFI-crash-mitigations.inc       |  1 +
- gpu/config/gpu_driver_bug_list.json              | 16 ++++++++++++++++
- gpu/config/gpu_finch_features.cc                 |  5 +++++
- gpu/config/gpu_finch_features.h                  |  1 +
- gpu/config/gpu_util.cc                           |  8 ++++++++
- gpu/config/gpu_workaround_list.txt               |  1 +
- gpu/ipc/service/gpu_init.cc                      |  8 ++++++++
- gpu/ipc/service/stream_texture_android.cc        | 11 ++++++++++-
- 12 files changed, 87 insertions(+), 4 deletions(-)
- create mode 100644 cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
- create mode 100644 cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-
-diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
--- a/base/android/android_image_reader_compat.cc
-+++ b/base/android/android_image_reader_compat.cc
-@@ -7,7 +7,23 @@
- namespace base {
- namespace android {
- 
-+AndroidImageReader& AndroidImageReader::GetInstance() {
-+  // C++11 static local variable initialization is
-+  // thread-safe.
-+  static AndroidImageReader instance;
-+  return instance;
-+}
-+
-+void AndroidImageReader::DisableSupport() {
-+  disable_support_ = true;
-+}
-+
-+bool AndroidImageReader::IsSupported() {
-+  return !disable_support_;
-+}
-+
- bool EnableAndroidImageReader() {
-+  if (!AndroidImageReader::GetInstance().IsSupported()) return false;
-   // Currently we want to enable AImageReader only for android P+ devices.
-   if (__builtin_available(android 28, *)) {
-     return true;
-diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h
--- a/base/android/android_image_reader_compat.h
-+++ b/base/android/android_image_reader_compat.h
-@@ -10,6 +10,20 @@
- namespace base {
- namespace android {
- 
-+class BASE_EXPORT AndroidImageReader {
-+ public:
-+  // Thread safe GetInstance.
-+  static AndroidImageReader& GetInstance();
-+
-+  bool IsSupported();
-+
-+  // Disable image reader support.
-+  void DisableSupport();
-+
-+ private:
-+  bool disable_support_ = false;
-+};
-+
- // Check if the image reader usage is supported.
- BASE_EXPORT bool EnableAndroidImageReader();
- 
-diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
--- a/chrome/browser/flag-metadata.json
-+++ b/chrome/browser/flag-metadata.json
-@@ -3186,9 +3186,9 @@
-     "expiry_milestone": 135
-   },
-   {
-    "name": "enable-image-reader",
-    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],
-    "expiry_milestone": 125
-+    "name": "enable-image-reader",          // Bromite: do not expire
-+    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],  // flag
-+    "expiry_milestone": -1
-   },
-   {
-     "name": "enable-immersive-fullscreen-toolbar",
-diff --git a/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
-@@ -0,0 +1,4 @@
-+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
-+CROMITE_FEATURE(kAImageReaderVideoOutput,
-+                "AImageReaderVideoOutput",
-+                base::FEATURE_ENABLED_BY_DEFAULT);
-diff --git a/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-@@ -0,0 +1 @@
-+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
-diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
--- a/gpu/config/gpu_driver_bug_list.json
-+++ b/gpu/config/gpu_driver_bug_list.json
-@@ -2689,6 +2689,22 @@
-         "no_downscaled_overlay_promotion"
-       ]
-     },
-+    {
-+      "id":335,
-+      "cr_bugs": [1051705],
-+      "description": "Disable AImageReader on ARM GPUs",
-+      "os": {
-+        "type": "android",
-+        "version": {
-+          "op": "<",
-+          "value": "10"
-+        }
-+      },
-+      "gl_vendor": "ARM.*|Qualcomm.*",
-+      "features": [
-+        "disable_aimagereader"
-+      ]
-+    },
-     {
-       "id": 381,
-       "cr_bugs": [
-diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
--- a/gpu/config/gpu_finch_features.cc
-+++ b/gpu/config/gpu_finch_features.cc
-@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- #if BUILDFLAG(IS_ANDROID)
-+// Use android AImageReader when playing videos with MediaPlayer.
-+CROMITE_FEATURE(kAImageReaderMediaPlayer,
-+                "AImageReaderMediaPlayer",
-+                base::FEATURE_ENABLED_BY_DEFAULT);
-+
- // Use android SurfaceControl API for managing display compositor's buffer queue
- // and using overlays on Android. Also used by webview to disable surface
- // SurfaceControl.
-diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
--- a/gpu/config/gpu_finch_features.h
-+++ b/gpu/config/gpu_finch_features.h
-@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
- // All features in alphabetical order. The features should be documented
- // alongside the definition of their values in the .cc file.
- #if BUILDFLAG(IS_ANDROID)
-+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
- GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(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
-@@ -124,6 +124,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
- #if !BUILDFLAG(IS_ANDROID)
-   return kGpuFeatureStatusDisabled;
- #else
-+  if (blocklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
-+    return kGpuFeatureStatusBlocklisted;
-+
-   if (!gpu_preferences.enable_android_surface_control)
-     return kGpuFeatureStatusDisabled;
- 
-@@ -385,6 +388,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
-     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
-         kGpuFeatureStatusBlocklisted;
-   }
-+
-+  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
-+    gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
-+        kGpuFeatureStatusBlocklisted;
-+  }
- }
- 
- // Estimates roughly user total disk space by counting in the drives where
-diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
--- a/gpu/config/gpu_workaround_list.txt
-+++ b/gpu/config/gpu_workaround_list.txt
-@@ -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
-+disable_aimagereader
- disable_accelerated_av1_encode
- disable_accelerated_h264_decode
- disable_accelerated_h264_encode
-diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
--- a/gpu/ipc/service/gpu_init.cc
-+++ b/gpu/ipc/service/gpu_init.cc
-@@ -69,6 +69,7 @@
- 
- #if BUILDFLAG(IS_ANDROID)
- #include "ui/gfx/android/android_surface_control_compat.h"
-+#include "base/android/android_image_reader_compat.h"
- #endif
- 
- #if BUILDFLAG(ENABLE_VULKAN)
-@@ -723,6 +724,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
-   }
- #endif  // BUILDFLAG(IS_WIN)
- 
-+#if BUILDFLAG(IS_ANDROID)
-+  // Disable AImageReader if the workaround is enabled.
-+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
-+    base::android::AndroidImageReader::GetInstance().DisableSupport();
-+  }
-+#endif
-+
-   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
-           kGpuFeatureStatusEnabled ||
-       !InitializeVulkan()) {
-diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
--- a/gpu/ipc/service/stream_texture_android.cc
-+++ b/gpu/ipc/service/stream_texture_android.cc
-@@ -6,6 +6,7 @@
- 
- #include <string.h>
- 
-+#include "base/android/android_image_reader_compat.h"
- #include "base/android/scoped_hardware_buffer_fence_sync.h"
- #include "base/feature_list.h"
- #include "base/functional/bind.h"
-@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
- }
- 
- TextureOwner::Mode GetTextureOwnerMode() {
-  return features::IsAImageReaderEnabled()
-+  const bool a_image_reader_supported =
-+      base::android::AndroidImageReader::GetInstance().IsSupported();
-+
-+  // TODO(vikassoni) : Currently we have 2 different flags to enable/disable
-+  // AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2
-+  // flags into a single flag. Keeping the 2 flags separate for now since finch
-+  // experiment using this flag is in progress.
-+  return a_image_reader_supported && features::IsAImageReaderEnabled() &&
-+             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer)
-              ? TextureOwner::Mode::kAImageReaderInsecure
-              : TextureOwner::Mode::kSurfaceTextureInsecure;
- }
--
@@ -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
-@@ -232,6 +232,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -239,6 +239,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ContentSwitches;
@@ -28,10 +28,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.printing.PrintingControllerImpl;
-@@ -1078,6 +1079,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -999,6 +1000,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         super.onStartWithNative();
-         ChromeActivitySessionTracker.getInstance().onStartWithNative();
-         ChromeCachedFlags.getInstance().cacheNativeFlags();
+ 
+         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
 +        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
 +                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);
 
@@ -40,42 +40,42 @@ 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
-@@ -138,6 +138,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &feed::kFeedPerformanceStudy,
     &feed::kFeedShowSignInCommand,
     &feed::kFeedSignedOutViewDemotion,
-     &feed::kFeedUserInteractionReliabilityReport,
 +    &kAllowUserCertificates,
+     &feed::kFeedRecyclerBinderUnmountOnDetach,
     &feed::kInterestFeedV2,
-     &feed::kInterestFeedV2Hearts,
     &feed::kWebFeedAwareness,
 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
-@@ -146,6 +146,7 @@ public abstract class ChromeFeatureList {
-     /* Alphabetical: */
-     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
-             "AccountReauthenticationRecentTimeWindow";
+@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {
+             "AccountForSuppressedKeyboardInsets";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
+             "AdaptiveButtonInTopToolbarCustomizationV2";
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =
-             "AdaptiveButtonInTopToolbarTranslate";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
-@@ -536,6 +537,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidTabGroupStableIds =
-             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, false);
-     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
+             "AdaptiveButtonInTopToolbarPageSummary";
+     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
+@@ -796,6 +797,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
+             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false);
+     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
-     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
+     public static final CachedFlag sAppSpecificHistoryViewIntent =
+             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
     public static final CachedFlag sAsyncNotificationManager =
-             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
-@@ -686,6 +689,7 @@ public abstract class ChromeFeatureList {
-     public static final List<CachedFlag> sFlagsCachedFullBrowser =
-             List.of(
-                     sAccountReauthenticationRecentTimeWindow,
-+                    sAllowUserCertificates,
+@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {
+                     sAndroidAnimatedProgressBarInBrowser,
+                     sAndroidAnimatedProgressBarInViz,
                     sAndroidAppIntegration,
-                     sAndroidElegantTextHeight,
-                     sAndroidHub,
+                    sAllowUserCertificates,
+                     sAndroidAppIntegrationModule,
+                     sAndroidAppIntegrationMultiDataSource,
+                     sAndroidAppIntegrationV2,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null
@@ -111,19 +111,19 @@ new file mode 100644
 diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
 --- a/net/android/java/src/org/chromium/net/X509Util.java
 +++ b/net/android/java/src/org/chromium/net/X509Util.java
-@@ -525,6 +525,8 @@ public class X509Util {
+@@ -537,6 +537,8 @@ public class X509Util {
         return userRootBytes.toArray(new byte[0][]);
     }
 
 +    public static boolean AllowUserCertificates = false;
 +
     public static AndroidCertVerifyResult verifyServerCertificates(
-             byte[][] certChain, String authType, String host)
-             throws KeyStoreException, NoSuchAlgorithmException {
-@@ -613,6 +615,9 @@ public class X509Util {
+             byte[][] certChain,
+             String authType,
+@@ -637,6 +639,9 @@ public class X509Util {
+                 X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);
                 isIssuedByKnownRoot = isKnownRoot(root);
             }
- 
 +            if (AllowUserCertificates == false && isIssuedByKnownRoot == false)
 +                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT);
 +
@@ -4,19 +4,23 @@ Subject: Add Alt+D hotkey to focus address bar

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 2 ++
- 1 file changed, 2 insertions(+)
+ .../src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 6 ++++++
+ 1 file changed, 6 insertions(+)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -204,6 +204,8 @@ public class KeyboardShortcuts {
-                 R.string.keyboard_shortcut_address_bar,
-                 KeyEvent.KEYCODE_L,
-                 KeyEvent.META_CTRL_ON);
-+        addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,
-+                KeyEvent.KEYCODE_D, KeyEvent.META_ALT_ON);
-         shortcutGroups.add(chromeFeatureShortcutGroup);
+@@ -895,6 +895,12 @@ public class KeyboardShortcuts {
+                     KeyEvent.KEYCODE_ESCAPE,
+                     KeyEvent.META_CTRL_ON);
+         }
+        addShortcut(context,
+                    shortcutGroupsById,
+                    R.string.keyboard_shortcut_chrome_feature_group_header,
+                    R.string.keyboard_shortcut_address_bar,
+                    KeyEvent.KEYCODE_D,
+                    KeyEvent.META_ALT_ON);
+         return new ArrayList<>(shortcutGroupsById.values());
+     }
 
-         KeyboardShortcutGroup webpageShortcutGroup =
 --
@@ -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
-@@ -306,6 +306,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -408,6 +408,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
       }
     }
 
@@ -7,17 +7,17 @@ adds a new flag in chrome://flags to re-enable the experiment
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 base/features.cc                                     |  4 ++++
- chrome/browser/about_flags.cc                        |  1 +
+ content/renderer/render_process_impl.cc              |  9 +++++++++
 .../Add-PartialLowEndModeOnMidRangeDevices-flag.inc  | 12 ++++++++++++
- 3 files changed, 17 insertions(+)
+ 3 files changed, 25 insertions(+)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc

 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -91,6 +91,10 @@ BASE_FEATURE(kCollectAndroidFrameTimelineMetrics,
-              FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -129,6 +129,10 @@ bool IsReducePPMsEnabled() {
+   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
+ }
 
 +#if BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
@@ -25,18 +25,37 @@ diff --git a/base/features.cc b/base/features.cc
 +
 void Init(EmitThreadControllerProfilerMetadata
               emit_thread_controller_profiler_metadata) {
-   InitializeCpuReductionExperiment();
-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
-@@ -16,6 +16,7 @@
- #include "base/base_switches.h"
- #include "base/command_line.h"
- #include "base/feature_list.h"
+   g_is_reduce_ppms_enabled.store(FeatureList::IsEnabled(kReducePPMs),
+diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
+--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
 +#include "base/features.h"
- #include "base/functional/bind.h"
- #include "base/functional/callback.h"
- #include "base/i18n/base_i18n_switches.h"
+ #include "content/renderer/render_process_impl.h"
+ 
+ #include "build/build_config.h"
+@@ -122,10 +123,18 @@ RenderProcessImpl::RenderProcessImpl()
+       base::CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kDisallowV8FeatureFlagOverrides);
+   if (!disallow_v8_feature_flag_overrides) {
+#if BUILDFLAG(IS_ANDROID)
+    if (base::SysInfo::IsLowEndDevice()
+          && base::FeatureList::IsEnabled(base::features::kPartialLowEndModeOnMidRangeDevices)) {
+      std::string_view optimize_flag("--optimize-for-size");
+      v8::V8::SetFlagsFromString(optimize_flag.data(), optimize_flag.size());
+    }
+#else
+     if (base::SysInfo::IsLowEndDevice()) {
+       std::string_view optimize_flag("--optimize-for-size");
+       v8::V8::SetFlagsFromString(optimize_flag.data(), optimize_flag.size());
+     }
+#endif
+ 
+     ////////////////////////////////////////////////////////////////////////////
+     // V8 flags are typically set in gin/v8_initializer.cc. Only those flags
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc
 new file mode 100644
 --- /dev/null
@@ -0,0 +1,39 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 2 Sep 2024 07:03:38 +0000
+Subject: Add a GN flag to disable trybot verification
+
+Adds flag in GN to deactivate the check performed by some google build bots.
+The flag is deactivated when generating the system webview with
+skip_secondary_abi_for_cq=true in arm64.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/android/expectations/expectations.gni | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/expectations/expectations.gni b/chrome/android/expectations/expectations.gni
+--- a/chrome/android/expectations/expectations.gni
+++ b/chrome/android/expectations/expectations.gni
+@@ -5,8 +5,12 @@
+ import("//build/config/android/config.gni")
+ import("//build/config/coverage/coverage.gni")
+ 
+declare_args() {
+    enable_trybot_verification = true
+}
+
+ # Chosen to match android-binary-size trybot.
+-enable_libs_and_assets_verification =
+enable_libs_and_assets_verification = enable_trybot_verification &&
+     !enable_chrome_android_internal && !is_component_build &&
+     !use_jacoco_coverage && is_official_build &&
+     (target_cpu == "arm64" && android_channel == "stable")
+@@ -15,6 +19,6 @@ enable_libs_and_assets_verification =
+ # use_jacoco_coverage: Adds proguard flags.
+ # android_channel: Manifest entries vary based on channel.
+ # target_cpu: android:versionCode varies.
+-enable_manifest_verification =
+enable_manifest_verification = enable_trybot_verification &&
+     !is_java_debug && !enable_chrome_android_internal && !use_jacoco_coverage &&
+     (target_cpu == "arm64" && android_channel == "stable")
+--
@@ -5,17 +5,20 @@ Subject: Add a flag to disable GamePad API
 Adds restrict-gamepad-access flag (default active) to disable GamePad API.
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/flag-metadata.json                           | 4 ++--
- chrome/browser/flag_descriptions.cc                         | 2 +-
- device/gamepad/public/cpp/gamepad_features.cc               | 1 +
- .../blink/renderer/modules/gamepad/navigator_gamepad.cc     | 6 ++++++
- 4 files changed, 10 insertions(+), 3 deletions(-)
+ chrome/browser/flag-metadata.json                         | 4 ++--
+ content/child/runtime_features.cc                         | 2 ++
+ .../about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc  | 7 +++++++
+ device/gamepad/public/cpp/gamepad_features.cc             | 8 ++++++++
+ device/gamepad/public/cpp/gamepad_features.h              | 2 ++
+ .../blink/renderer/modules/gamepad/navigator_gamepad.cc   | 6 ++++++
+ 6 files changed, 27 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc

 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7333,9 +7333,9 @@
-     "expiry_milestone": 126
+@@ -8787,9 +8787,9 @@
+     "expiry_milestone": 150
   },
   {
 -    "name": "restrict-gamepad-access",
@@ -25,47 +28,87 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
   },
   {
-     "name": "revamp-page-info-ios",
-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
-@@ -3005,7 +3005,7 @@ const char kResetShortcutCustomizationsDescription[] =
- 
- const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
- const char kRestrictGamepadAccessDescription[] =
-    "Enables Permissions Policy and Secure Context restrictions on the Gamepad "
-+    "Disable the Gamepad "
-     "API";
- 
- const char kRoundedDisplay[] = "Rounded display";
+     "name": "rewriter-api-for-gemini-nano",
+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
+@@ -263,6 +263,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+           {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
+           {wf::EnablePeriodicBackgroundSync,
+            raw_ref(features::kPeriodicBackgroundSync)},
+          {wf::EnableRestrictGamepadAccess,
+           raw_ref(features::kRestrictGamepadAccess)},
+           {wf::EnableSecurePaymentConfirmation,
+            raw_ref(features::kSecurePaymentConfirmation)},
+           {wf::EnableSecurePaymentConfirmationDebug,
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc
+@@ -0,0 +1,7 @@
+#ifdef FLAG_SECTION
+
+    {"restrict-gamepad-access", "Restrict gamepad access",
+     "Disable the Gamepad API", kOsAll,
+     FEATURE_VALUE_TYPE(features::kRestrictGamepadAccess)},
+
+#endif
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc
-@@ -65,4 +65,5 @@ bool IsGamepadMultitouchEnabled() {
+@@ -33,4 +33,12 @@ bool IsGamepadMultitouchEnabled() {
   return false;
 }
 
-+SET_CROMITE_FEATURE_ENABLED(kRestrictGamepadAccess);
+CROMITE_FEATURE(kRestrictGamepadAccess,
+                "RestrictGamepadAccess",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+
+bool IsRestrictGamepadAccessEnabled() {
+  return base::FeatureList::IsEnabled(kRestrictGamepadAccess);
+}
+
 }  // namespace features
+diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
+--- a/device/gamepad/public/cpp/gamepad_features.h
+++ b/device/gamepad/public/cpp/gamepad_features.h
+@@ -13,8 +13,10 @@ namespace features {
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
+     kEnableWindowsGamingInputDataFetcher);
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
+GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
+ 
+ GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
+GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
+ 
+ }  // namespace features
+ 
 diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
 --- a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
 +++ b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
-@@ -113,6 +113,10 @@ void RecordGamepadsForIdentifiabilityStudy(
+@@ -27,6 +27,7 @@
+ 
+ #include "base/auto_reset.h"
+ #include "device/gamepad/public/cpp/gamepads.h"
+#include "device/gamepad/public/cpp/gamepad_features.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
+ #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
+@@ -114,6 +115,9 @@ void RecordGamepadsForIdentifiabilityStudy(
 HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
     Navigator& navigator,
     ExceptionState& exception_state) {
-+  if (base::FeatureList::IsEnabled(::features::kRestrictGamepadAccess)) {
-+    exception_state.ThrowSecurityError("Access to the feature \"gamepad\" is denied");
+  if (::features::IsRestrictGamepadAccessEnabled()) {
 +    return HeapVector<Member<Gamepad>>();
 +  }
   if (!navigator.DomWindow()) {
     // Using an existing NavigatorGamepad if one exists, but don't create one
     // for a detached window, as its subclasses depend on a non-null window.
-@@ -435,6 +439,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
+@@ -420,6 +424,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
 
 void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
                                             Gamepad* gamepad) {
-+  if (base::FeatureList::IsEnabled(::features::kRestrictGamepadAccess))
+  if (::features::IsRestrictGamepadAccessEnabled())
 +    return;
   // Ensure that we're blocking re-entrancy.
   DCHECK(processing_events_);
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/android/java/res/values/values.xml     |   3 +
 .../java/res/xml/privacy_preferences.xml      |   4 +
 .../privacy/settings/PrivacySettings.java     |   1 +
- .../chrome_autocomplete_provider_client.cc    |   2 +
+ .../chrome_autocomplete_provider_client.cc    |   1 +
 chrome/browser/browser_resources.grd          |   3 +
 .../extensions/api/proxy/proxy_api_helpers.cc |   2 +-
 chrome/browser/net/proxy_service_factory.cc   |  24 +-
@@ -29,18 +29,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/resources/proxy_config.html    |  77 ++++
 chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
 chrome/browser/ui/BUILD.gn                    |   2 +
- .../webui/chrome_web_ui_controller_factory.cc |   3 +
- 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 +
+ .../browser/ui/webui/chrome_web_ui_configs.cc |   5 +-
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++
+ chrome/common/webui_url_constants.cc          |   2 +
 chrome/common/webui_url_constants.h           |   2 +
 .../pref_proxy_config_tracker_impl.cc         |   5 +-
 .../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/pac_file_fetcher_impl.cc |   8 -
+ net/proxy_resolution/proxy_config.cc          |  53 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 980 insertions(+), 17 deletions(-)
+ 26 files changed, 986 insertions(+), 26 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 +51,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.
+@@ -22,6 +22,9 @@ found in the LICENSE file.
     <!-- Compositor Tab Title Text -->
     <bool name="compositor_tab_title_fake_bold_text">true</bool>
 
@@ -77,43 +78,42 @@ 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
-@@ -78,6 +78,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     private static final String PREF_SAFE_BROWSING = "safe_browsing";
+@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
 +    private static final String PREF_PROXY_OPTIONS = "proxy";
     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
-     private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
+     private static final String PREF_JAVASCRIPT_OPTIMIZER = "javascript_optimizer";
 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
-@@ -303,6 +303,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
-   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
+@@ -409,6 +409,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
 #endif
-+  builtins_to_provide.push_back(
-+      base::ASCIIToUTF16(chrome::kChromeUIProxyConfigURL));
-   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUIVersionURL));
+   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
+  builtins_to_provide.push_back(chrome::kChromeUIProxyConfigURL16);
   return builtins_to_provide;
+ }
+ 
 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
-@@ -233,6 +233,9 @@
+@@ -226,6 +226,9 @@
         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />
       </if>
 +      <!-- Bromite Proxy Configuration UI -->
 +      <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
 +      <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
-       <if expr="not is_android">
+       <if expr="not is_android or enable_extensions_core">
         <!-- Page not available for guest. -->
         <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
-@@ -387,7 +387,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
+@@ -372,7 +372,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
         return std::nullopt;
       }
       return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -141,9 +141,9 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 +#include "components/prefs/pref_service.h"
 +#include "components/prefs/pref_registry_simple.h"
 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h"
-@@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
+@@ -57,7 +61,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
   return std::make_unique<ash::ProxyConfigServiceImpl>(
       profile_prefs, local_state_prefs, nullptr);
 #else
@@ -162,12 +162,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 +    local_state_prefs->CommitPendingWrite();
 +  }
 +  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 }
 
-@@ -86,3 +103,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+@@ -73,3 +90,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
                                                       nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 }
 +
 +// static
@@ -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
-@@ -191,6 +191,8 @@
+@@ -204,6 +204,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"
+ #include "chrome/browser/background/extensions/background_mode_manager.h"
 #endif
-@@ -1523,6 +1525,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1692,6 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -163,7 +163,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
     SetValue(proxy_config::prefs::kProxy,
              base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -661,7 +661,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -314,6 +314,8 @@ static_library("ui") {
+@@ -156,6 +156,8 @@ static_library("ui") {
     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -670,31 +670,33 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
     "webui/net_internals/net_internals_ui.cc",
     "webui/net_internals/net_internals_ui.h",
     "webui/ntp_tiles_internals_ui.cc",
-diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -55,6 +55,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"
+diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+@@ -58,6 +58,9 @@
+ #include "extensions/buildflags/buildflags.h"
+ #include "printing/buildflags/buildflags.h"
+ 
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
- #include "chrome/browser/ui/webui/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"
-@@ -455,6 +456,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
-     return &NewWebUI<MetricsInternalsUI>;
-   if (url.host_piece() == chrome::kChromeUINetExportHost)
-     return &NewWebUI<NetExportUI>;
-+  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
-+    return &NewWebUI<ProxyConfigUI>;
-   if (url.host_piece() == chrome::kChromeUINetInternalsHost)
-     return &NewWebUI<NetInternalsUI>;
-   if (url.host_piece() == chrome::kChromeUINTPTilesInternalsHost)
+
+
+ #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
+ #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
+ #endif
+@@ -424,7 +427,7 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
+   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
+ #endif
+-
+  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
+ #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+   map.AddWebUIConfig(
+       std::make_unique<safe_browsing::ChromeSafeBrowsingUIConfig>());
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,393 @@
+@@ -0,0 +1,389 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -756,7 +758,6 @@ new file mode 100644
 +// this class's public methods are expected to run on the UI thread.
 +class ProxyConfigMessageHandler
 +    : public WebUIMessageHandler,
-+      public base::SupportsWeakPtr<ProxyConfigMessageHandler>,
 +      public net::ProxyConfigService::Observer {
 + public:
 +  ProxyConfigMessageHandler(const ProxyConfigMessageHandler&) = delete;
@@ -794,12 +795,10 @@ new file mode 100644
 +
 +  void apply(const net::ProxyConfig& config);
 +
-+  base::WeakPtrFactory<ProxyConfigMessageHandler> weak_ptr_factory_;
+  base::WeakPtrFactory<ProxyConfigMessageHandler> weak_ptr_factory_{this};
 +};
 +
-+ProxyConfigMessageHandler::ProxyConfigMessageHandler(Profile *profile)
-+    :
-+      weak_ptr_factory_(this) {
+ProxyConfigMessageHandler::ProxyConfigMessageHandler(Profile *profile) {
 +
 +  // used to set new configuration preferences
 +  pref_service_ = g_browser_process->local_state();
@@ -896,7 +895,6 @@ new file mode 100644
 +      break;
 +    default:
 +     NOTREACHED();
-+     break;
 +  }
 +  state.SetByDottedPath("config.rules.type", base::Value(type));
 +  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));
@@ -978,7 +976,7 @@ new file mode 100644
 +  }
 +
 +  if (const std::string* pacURL = config.FindString("pac_url")) {
-+    absl::optional<bool> pacMandatory = config.FindBool("pac_mandatory");
+    std::optional<bool> pacMandatory = config.FindBool("pac_mandatory");
 +    auto proxyConfig = net::ProxyConfig::CreateFromCustomPacURL(
 +                                GURL(*pacURL));
 +    proxyConfig.set_pac_mandatory(pacMandatory.value_or(false));
@@ -1038,7 +1036,7 @@ new file mode 100644
 +    if (bypass_rules == nullptr)
 +      return;
 +
-+    absl::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
+    std::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
 +
 +    proxyConfig.proxy_rules().bypass_rules.ParseFromString(*bypass_rules);
 +    proxyConfig.proxy_rules().reverse_bypass = reverse_bypass.value_or(false);
@@ -1092,7 +1090,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,41 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1113,7 +1111,9 @@ new file mode 100644
 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +
+#include "chrome/common/webui_url_constants.h"
 +#include "content/public/browser/web_ui_controller.h"
+#include "content/public/browser/webui_config.h"
 +
 +// The WebUI for chrome://proxy/.
 +class ProxyConfigUI : public content::WebUIController {
@@ -1123,20 +1123,19 @@ new file mode 100644
 +  explicit ProxyConfigUI(content::WebUI* web_ui);
 +};
 +
+class ProxyConfigUIConfig
+    : public content::DefaultWebUIConfig<ProxyConfigUI> {
+ public:
+  ProxyConfigUIConfig()
+      : DefaultWebUIConfig(content::kChromeUIScheme,
+                           chrome::kChromeUIProxyConfigHost) {}
+};
+
 +#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -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/";
-+const char kChromeUIProxyConfigHost[] = "proxy";
-+const char kChromeUIProxyConfigURL[] = "chrome://proxy/";
- const char kChromeUIChromeURLsHost[] = "chrome-urls";
- const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
- const char kChromeUIComponentsHost[] = "components";
-@@ -464,6 +466,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {
       kChromeUILockScreenNetworkHost,
       kChromeUILockScreenStartReauthHost,
       kChromeUIMobileSetupHost,
@@ -1144,30 +1143,30 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
       kChromeUIMultiDeviceSetupHost,
       kChromeUINetworkHost,
       kChromeUINotificationTesterHost,
-@@ -760,6 +763,7 @@ const char* const kChromeHostURLs[] = {
- #if !BUILDFLAG(IS_ANDROID)
- #if !BUILDFLAG(IS_CHROMEOS)
-     kChromeUIAppLauncherPageHost,
-+    kChromeUIProxyConfigHost,
- #endif
-     kChromeUIBookmarksHost,
-     kChromeUIDownloadsHost,
+@@ -74,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+ // These hosts will also be suggested by BuiltinProvider.
+ base::span<const base::cstring_view> ChromeURLHosts() {
+   static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
+      kChromeUIProxyConfigHost,
+       kChromeUIAboutHost,
+       kChromeUIAccessibilityHost,
+       kChromeUIActorInternalsHost,
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -135,6 +135,8 @@ extern const char kChromeUINTPTilesInternalsHost[];
- extern const char kChromeUINaClHost[];
- extern const char kChromeUINetExportHost[];
- extern const char kChromeUINetExportURL[];
-+extern const char kChromeUIProxyConfigHost[];
-+extern const char kChromeUIProxyConfigURL[];
- extern const char kChromeUINetInternalsHost[];
- extern const char kChromeUINetInternalsURL[];
- extern const char kChromeUINewTabHost[];
+@@ -188,6 +188,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+ inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
+ inline constexpr char kChromeUINewTabHost[] = "newtab";
+ inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";
+inline constexpr char16_t kChromeUIProxyConfigURL16[] = u"chrome://proxy/";
+inline constexpr char kChromeUIProxyConfigHost[] = "proxy";
+ inline constexpr char kChromeUINewTabPageHost[] = "new-tab-page";
+ inline constexpr char kChromeUINewTabPageThirdPartyHost[] =
+     "new-tab-page-third-party";
 diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
 --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
 +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
-@@ -244,14 +244,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
+@@ -253,14 +253,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
 // static
 void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
@@ -1184,7 +1183,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone
   registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false);
 }
 
-@@ -388,6 +388,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+@@ -405,6 +405,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
       if (proxy_dict.GetBypassList(&proxy_bypass)) {
         proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
       }
@@ -1321,7 +1320,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
 diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
 --- a/components/proxy_config/proxy_policy_handler.cc
 +++ b/components/proxy_config/proxy_policy_handler.cc
-@@ -376,7 +376,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+@@ -378,7 +378,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
             server->GetString(), bypass_list && bypass_list->is_string()
                                      ? bypass_list->GetString()
@@ -1330,19 +1329,37 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
       }
       break;
     }
+diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
+--- a/net/proxy_resolution/pac_file_fetcher_impl.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
+@@ -359,14 +359,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
+     return false;
+   }
+ 
+-  // Enforce maximum size bound.
+-  if (num_bytes + bytes_read_so_far_.size() >
+-      static_cast<size_t>(max_response_bytes_)) {
+-    result_code_ = ERR_FILE_TOO_BIG;
+-    request->Cancel();
+-    return false;
+-  }
+-
+   bytes_read_so_far_.append(buf_->data(), num_bytes);
+   return true;
+ }
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -109,7 +109,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
-                                    &single_proxies,
-                                    ProxyServer::SCHEME_HTTP);
+@@ -133,7 +133,7 @@ void ProxyConfig::ProxyRules::ParseFromString(std::string_view proxy_rules,
+             url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP,
+             allow_bracketed_proxy_chains, is_quic_allowed);
         type = Type::PROXY_LIST;
 -        return;
 +        continue;
       }
 
       // Trim whitespace off the url scheme.
-@@ -140,6 +140,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -164,6 +164,57 @@ void ProxyConfig::ProxyRules::ParseFromString(std::string_view proxy_rules,
   }
 }
 
@@ -1350,8 +1367,10 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +  if (type == Type::PROXY_LIST) {
 +    std::string proxy_list;
 +    for (const auto& proxy_chain : single_proxies.AllChains()) {
-+      net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+      proxy_list += ProxyServerToProxyUri(proxy_server) + ";";
+      if (proxy_chain.length()) {
+        net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+        proxy_list += ProxyServerToProxyUri(proxy_server) + ";";
+      }
 +    }
 +    // remove last semicolon
 +    if (proxy_list.length() != 0 ) {
@@ -1397,14 +1416,14 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +
 const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
     const std::string& url_scheme) const {
-   const ProxyList* proxy_server_list = const_cast<ProxyRules*>(this)->
+   const ProxyList* proxy_server_list =
 diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h
 --- a/net/proxy_resolution/proxy_config.h
 +++ b/net/proxy_resolution/proxy_config.h
-@@ -103,6 +103,9 @@ class NET_EXPORT ProxyConfig {
-     //                                  and use socks4://foopy2 for all other
-     //                                  URLs.
-     void ParseFromString(const std::string& proxy_rules);
+@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig {
+     void ParseFromString(std::string_view proxy_rules,
+                          bool allow_bracketed_proxy_chains = false,
+                          bool is_quic_allowed = false);
 +    // Returns the proxy rules in a format that can be parsed by ParseFromString;
 +    // all information except bypass rules is used.
 +    std::string ToString() const;
@@ -164,7 +164,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -177,8 +177,8 @@ new file mode 100644
 +public class BromiteAutoplayContentSetting extends BromiteCustomContentSetting {
 +    public BromiteAutoplayContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.AUTOPLAY,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*defaultEnabledValue*/ ContentSetting.ALLOW,
+              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "autoplay",
 +              /*profilePrefKey*/ "autoplay");
@@ -197,11 +197,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
+            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_autoplay_enabled;
-+            case ContentSettingValues.BLOCK:
+            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_autoplay_disabled;
 +            default:
 +                return 0;
@@ -229,8 +229,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
+        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/autoplay.grdp b/components/browser_ui/strings/bromite_content_settings/autoplay.grdp
@@ -279,9 +279,9 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -248,7 +248,7 @@ void ContentSettingsRegistry::Init() {
+@@ -255,7 +255,7 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
 -  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW,
 +  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_BLOCK,
@@ -291,15 +291,15 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
 #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h"
- #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
+ #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h"
 #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom-blink.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 #include "third_party/blink/public/platform/web_media_player.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_local_frame_client.h"
-@@ -330,6 +331,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
+@@ -346,6 +347,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;
 
-@@ -428,6 +431,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -457,6 +460,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
+@@ -148,6 +148,10 @@ class CORE_EXPORT AutoplayPolicy final
   // should use, if checking to see if an action is allowed.
   bool IsLockedPendingUserGesture() const;
 
@@ -0,0 +1,932 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 22 Aug 2025 15:41:58 +0000
+Subject: Add cromite test support
+
+Allows the activation of specific APIs used for cromite testing.
+API are only available on the chrome://version page.
+It allows the use of tools such as Browserstack for test automation.
+Do not activate the corresponding options (available in the developer
+settings) if you do not know what you are doing.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../java/res/xml/developer_preferences.xml    |  12 ++
+ .../init/ProcessInitializationHandler.java    |   6 +-
+ .../tracing/settings/DeveloperSettings.java   |   2 +-
+ chrome/browser/BUILD.gn                       |   5 +
+ chrome/browser/android/devtools_server.cc     |  10 +
+ ...ontent_browser_client_receiver_bindings.cc |  10 +
+ .../cromite/cromite_private_api_host.cc       |  74 +++++++
+ .../cromite/cromite_private_api_host.h        |  54 +++++
+ .../browser/flags/cromite/sActAsWebView.java  |  33 +++
+ .../cromite/sEnableCromiteTestSupport.java    |  33 +++
+ .../NotificationPermissionController.java     |   1 +
+ chrome/browser/ui/startup/bad_flags_prompt.cc |   1 +
+ chrome/common/BUILD.gn                        |   1 +
+ .../cromite_private_api_extension.mojom       |   7 +
+ chrome/renderer/BUILD.gn                      |   2 +
+ .../chrome_content_renderer_client.cc         |   2 +
+ .../cromite/cromite_private_api_extension.cc  | 203 ++++++++++++++++++
+ .../cromite/cromite_private_api_extension.h   |  65 ++++++
+ .../component_updater_service.h               |   1 +
+ .../browser/devtools/devtools_http_handler.cc |   7 +-
+ content/browser/log_console_message.cc        |  15 +-
+ content/browser/log_console_message.h         |   3 +-
+ .../renderer_host/render_frame_host_impl.cc   |  13 +-
+ .../about_flags_cc/Enable-test-support.inc    |  19 ++
+ .../Enable-test-support.inc                   |   7 +
+ .../Enable-test-support.inc                   |   2 +
+ 26 files changed, 581 insertions(+), 7 deletions(-)
+ create mode 100644 chrome/browser/cromite/cromite_private_api_host.cc
+ create mode 100644 chrome/browser/cromite/cromite_private_api_host.h
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+ create mode 100644 chrome/common/cromite_private_api_extension.mojom
+ create mode 100644 chrome/renderer/cromite/cromite_private_api_extension.cc
+ create mode 100644 chrome/renderer/cromite/cromite_private_api_extension.h
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+
+diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml
+--- a/chrome/android/java/res/xml/developer_preferences.xml
+++ b/chrome/android/java/res/xml/developer_preferences.xml
+@@ -12,6 +12,18 @@ found in the LICENSE file.
+         android:fragment="org.chromium.chrome.browser.tracing.settings.TracingSettings"
+         android:key="tracing"
+         android:title="Tracing" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="enable_cromite_test_support"
+        android:title="Enable support for cromite test"
+        android:summary="Setting allows the activation of specific APIs used for cromite testing. Do not activate if you do not know what you are doing."
+        app:featureName="enable-cromite-test-support"
+        app:needRestart="true" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="act_as_webview"
+        android:title="Enable webview support for cromite test"
+        android:summary="Setting allows the activation of specific APIs used for cromite testing. Do not activate if you do not know what you are doing."
+        app:featureName="act-as-webview"
+        app:needRestart="true" />
+     <Preference
+         android:key="test_gwp_asan"
+         android:title="Test Gwp Asan"/>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+@@ -144,6 +144,7 @@ import org.chromium.ui.base.SelectFileDialog;
+ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
+ import org.chromium.url.GURL;
+import org.chromium.chrome.browser.flags.cromite.sActAsWebView;
+ 
+ import java.io.File;
+ import java.nio.charset.StandardCharsets;
+@@ -710,7 +711,10 @@ public class ProcessInitializationHandler {
+ 
+         tasks.add(
+                 () -> {
+-                    mDevToolsServer = new DevToolsServer(DEV_TOOLS_SERVER_SOCKET_PREFIX);
+                    String socketPrefix = DEV_TOOLS_SERVER_SOCKET_PREFIX;
+                    if (sActAsWebView.getInstance().isEnabled())
+                        socketPrefix = "weblayer";
+                    mDevToolsServer = new DevToolsServer(socketPrefix);
+                     mDevToolsServer.setRemoteDebuggingEnabled(
+                             true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION);
+                 });
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+@@ -35,7 +35,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
+     private final ObservableSupplier<String> mPageTitle =
+             new ObservableSupplierImpl<>(MSG_DEVELOPER_OPTIONS_TITLE);
+ 
+-    private static @Nullable Boolean sIsEnabledForTests;
+    private static @Nullable Boolean sIsEnabledForTests = true;
+ 
+     public static boolean shouldShowDeveloperSettings() {
+         // Always enabled on canary, dev and local builds, otherwise can be enabled by tapping the
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
+@@ -188,6 +188,11 @@ source_set("shell_integration") {
+ # require many files from it. This makes linking more efficient.
+ static_library("browser") {
+   sources = [
+    "cromite/cromite_private_api_host.cc",
+    "cromite/cromite_private_api_host.h",
+  ]
+
+  sources += [
+     "about_flags.cc",
+     "accessibility/accessibility_labels_service.cc",
+     "accessibility/accessibility_labels_service.h",
+diff --git a/chrome/browser/android/devtools_server.cc b/chrome/browser/android/devtools_server.cc
+--- a/chrome/browser/android/devtools_server.cc
+++ b/chrome/browser/android/devtools_server.cc
+@@ -12,6 +12,7 @@
+ #include "base/command_line.h"
+ #include "base/compiler_specific.h"
+ #include "base/files/file_path.h"
+#include "base/feature_list.h"
+ #include "base/functional/bind.h"
+ #include "base/functional/callback.h"
+ #include "base/strings/string_number_conversions.h"
+@@ -32,6 +33,7 @@
+ #include "content/public/browser/render_view_host.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/url_constants.h"
+ #include "net/base/net_errors.h"
+@@ -64,6 +66,8 @@ const int kBackLog = 10;
+ 
+ bool AuthorizeSocketAccessWithDebugPermission(
+     const net::UnixDomainServerSocket::Credentials& credentials) {
+  if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
+    return true;
+   JNIEnv* env = base::android::AttachCurrentThread();
+   return Java_DevToolsServer_checkDebugPermission(env, credentials.process_id,
+                                                   credentials.user_id) ||
+@@ -127,6 +131,10 @@ DevToolsServer::DevToolsServer(const std::string& socket_name_prefix)
+     : socket_name_(base::StringPrintf(kDevToolsChannelNameFormat,
+                                       socket_name_prefix.c_str())),
+       is_started_(false) {
+  if (base::FeatureList::IsEnabled(features::kActAsWebView)) {
+    socket_name_ = base::StringPrintf("%s_devtools_remote_%d",
+        socket_name_prefix.c_str(), getpid());
+  }
+   // Override the socket name if one is specified on the command line.
+   const base::CommandLine& command_line =
+       *base::CommandLine::ForCurrentProcess();
+@@ -144,6 +152,8 @@ void DevToolsServer::Start(bool allow_debug_permission) {
+   if (is_started_)
+     return;
+ 
+  DLOG(INFO) << "---DevToolsServer::Start allow_debug_permission=" << allow_debug_permission;
+  DLOG(INFO) << "---socket_name_=" << socket_name_;
+   net::UnixDomainServerSocket::AuthCallback auth_callback =
+       allow_debug_permission
+           ? base::BindRepeating(&AuthorizeSocketAccessWithDebugPermission)
+diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+@@ -10,6 +10,7 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/chrome_browser_interface_binders.h"
+#include "chrome/browser/cromite/cromite_private_api_host.h"
+ #include "chrome/browser/chrome_browser_interface_binders_webui.h"
+ #include "chrome/browser/chrome_content_browser_client.h"
+ #include "chrome/browser/chrome_content_browser_client_parts.h"
+@@ -494,6 +495,15 @@ void ChromeContentBrowserClient::
+                                                     render_frame_host);
+       },
+       &render_frame_host));
+  associated_registry.AddInterface<
+      chrome::mojom::CromitePrivateApiExtension>(base::BindRepeating(
+      [](content::RenderFrameHost* render_frame_host,
+         mojo::PendingAssociatedReceiver<
+             chrome::mojom::CromitePrivateApiExtension> receiver) {
+        CromitePrivateApiHost::BindHost(std::move(receiver),
+                                        render_frame_host);
+      },
+      &render_frame_host));
+   associated_registry.AddInterface<
+       chrome::mojom::GoogleAccountsPrivateApiExtension>(base::BindRepeating(
+       [](content::RenderFrameHost* render_frame_host,
+diff --git a/chrome/browser/cromite/cromite_private_api_host.cc b/chrome/browser/cromite/cromite_private_api_host.cc
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/cromite/cromite_private_api_host.cc
+@@ -0,0 +1,74 @@
+#include "chrome/browser/cromite/cromite_private_api_host.h"
+
+#include "base/json/json_writer.h"
+
+#include "chrome/browser/browser_process.h"
+#include "components/component_updater/component_updater_service.h"
+#include "components/update_client/crx_update_item.h"
+#include "content/public/browser/document_user_data.h"
+#include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/site_instance.h"
+
+CromitePrivateApiHost::CromitePrivateApiHost(
+    content::RenderFrameHost* rfh)
+    : DocumentUserData<CromitePrivateApiHost>(rfh),
+      receiver_(this) {}
+
+CromitePrivateApiHost::~CromitePrivateApiHost() = default;
+
+DOCUMENT_USER_DATA_KEY_IMPL(CromitePrivateApiHost);
+
+void CromitePrivateApiHost::BindReceiver(
+    mojo::PendingAssociatedReceiver<
+        chrome::mojom::CromitePrivateApiExtension> receiver) {
+  receiver_.Bind(std::move(receiver));
+}
+
+void CromitePrivateApiHost::GetComponentData(
+    const std::string& id,
+    GetComponentDataCallback callback) {
+  LOG(INFO) << "---CromitePrivateApiHost::GetComponentData "
+            << "id=" << id;
+  const raw_ptr<component_updater::ComponentUpdateService>
+    component_updater = g_browser_process->component_updater();
+
+  update_client::CrxUpdateItem item;
+  if (component_updater->GetComponentDetails(id, &item) && item.component) {
+    base::Value::Dict dict;
+    dict.Set("id", id);
+    dict.Set("version", item.component->version.GetString());
+    dict.Set("status", (int)item.state);
+
+    std::string json_string;
+      base::JSONWriter::WriteWithOptions(
+          dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
+      base::TrimWhitespaceASCII(json_string, base::TRIM_ALL, &json_string);
+
+    std::move(callback).Run(json_string);
+  }
+}
+
+void CromitePrivateApiHost::StartComponentUpdate(const std::string& id) {
+  LOG(INFO) << "---CromitePrivateApiHost::StartComponentUpdate "
+            << "id=" << id;
+  const raw_ptr<component_updater::ComponentUpdateService>
+    component_updater = g_browser_process->component_updater();
+  component_updater->GetOnDemandUpdater().OnDemandUpdate(
+      id, component_updater::OnDemandUpdater::Priority::FOREGROUND,
+      component_updater::Callback());
+}
+
+void CromitePrivateApiHost::SetEnableLogConsole(bool enabled) {
+  enable_log_console_ = enabled;
+}
+
+// static
+void CromitePrivateApiHost::BindHost(
+    mojo::PendingAssociatedReceiver<
+        chrome::mojom::CromitePrivateApiExtension> receiver,
+    content::RenderFrameHost* render_frame_host) {
+  CromitePrivateApiHost* api_host =
+      CromitePrivateApiHost::GetOrCreateForCurrentDocument(render_frame_host);
+  api_host->BindReceiver(std::move(receiver));
+}
+diff --git a/chrome/browser/cromite/cromite_private_api_host.h b/chrome/browser/cromite/cromite_private_api_host.h
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/cromite/cromite_private_api_host.h
+@@ -0,0 +1,54 @@
+#ifndef CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
+#define CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
+
+#include <string>
+
+#include "base/functional/callback.h"
+#include "chrome/common/cromite_private_api_extension.mojom.h"
+#include "content/public/browser/document_user_data.h"
+#include "mojo/public/cpp/bindings/associated_receiver.h"
+
+namespace content {
+class NavigationHandle;
+class RenderFrameHost;
+}  // namespace content
+
+class CromitePrivateApiHost
+    : public chrome::mojom::CromitePrivateApiExtension,
+      public content::DocumentUserData<CromitePrivateApiHost> {
+ public:
+  ~CromitePrivateApiHost() override;
+  CromitePrivateApiHost(const CromitePrivateApiHost&) = delete;
+  CromitePrivateApiHost& operator=(const CromitePrivateApiHost&) =
+      delete;
+
+  static void BindHost(
+      mojo::PendingAssociatedReceiver<
+          chrome::mojom::CromitePrivateApiExtension> receiver,
+      content::RenderFrameHost* render_frame_host);
+
+  void BindReceiver(mojo::PendingAssociatedReceiver<
+                    chrome::mojom::CromitePrivateApiExtension> receiver);
+
+  bool IsLogConsoleEnabled() const { return enable_log_console_; }
+
+  // chrome::mojom::CromitePrivateApiExtension:
+  void GetComponentData(const std::string& id,
+                        GetComponentDataCallback callback) override;
+  void StartComponentUpdate(const std::string& id) override;
+  void SetEnableLogConsole(bool can_show) override;
+
+ private:
+  explicit CromitePrivateApiHost(
+      content::RenderFrameHost* rfh);
+
+  friend DocumentUserData;
+  DOCUMENT_USER_DATA_KEY_DECL();
+
+  mojo::AssociatedReceiver<chrome::mojom::CromitePrivateApiExtension>
+      receiver_;
+
+  bool enable_log_console_ = false;
+};
+
+#endif  // CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+@@ -0,0 +1,33 @@
+/*
+    This file is part of Cromite.
+
+    Cromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Cromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.chrome.browser.flags.cromite;
+
+import org.chromium.components.cached_flags.CachedFlag;
+import org.chromium.chrome.browser.flags.ChromeFeatureMap;
+
+public class sActAsWebView {
+    private static final CachedFlag sInstance =
+        new CachedFlag(ChromeFeatureMap.getInstance(),
+            "ActAsWebView", false);
+
+    private sActAsWebView() {}
+
+    public static CachedFlag getInstance() {
+        return sInstance;
+    }
+}
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+@@ -0,0 +1,33 @@
+/*
+    This file is part of Cromite.
+
+    Cromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Cromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.chrome.browser.flags.cromite;
+
+import org.chromium.components.cached_flags.CachedFlag;
+import org.chromium.chrome.browser.flags.ChromeFeatureMap;
+
+public class sEnableCromiteTestSupport {
+    private static final CachedFlag sInstance =
+        new CachedFlag(ChromeFeatureMap.getInstance(),
+            "EnableCromiteTestSupport", false);
+
+    private sEnableCromiteTestSupport() {}
+
+    public static CachedFlag getInstance() {
+        return sInstance;
+    }
+}
+diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+@@ -182,6 +182,7 @@ public class NotificationPermissionController implements UnownedUserData {
+      * @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise.
+      */
+     public boolean requestPermissionIfNeeded(boolean contextual) {
+        if (!contextual) return false;
+         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+                 || ApiCompatibilityUtils.isDemoUser()) {
+             return false;
+diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
+--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
+@@ -210,6 +210,7 @@ static const base::Feature* kBadFeatureFlagsInAboutFlags[] = {
+ 
+ #if BUILDFLAG(IS_ANDROID)
+     &chrome::android::kCommandLineOnNonRooted,
+    &features::kEnableCromiteTestSupport,
+ #endif
+ 
+     // This flag disables security for the Page Embedded Permission Control, for
+diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
+--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
+@@ -662,6 +662,7 @@ mojom("mojo_bindings") {
+   sources = [
+     "chrome_render_frame.mojom",
+     "google_accounts_private_api_extension.mojom",
+    "cromite_private_api_extension.mojom",
+     "media/webrtc_logging.mojom",
+     "net/net_error_page_support.mojom",
+     "net_benchmarking.mojom",
+diff --git a/chrome/common/cromite_private_api_extension.mojom b/chrome/common/cromite_private_api_extension.mojom
+new file mode 100644
+--- /dev/null
+++ b/chrome/common/cromite_private_api_extension.mojom
+@@ -0,0 +1,7 @@
+module chrome.mojom;
+
+interface CromitePrivateApiExtension {
+  GetComponentData(string id) => (string response);
+  StartComponentUpdate(string id);
+  SetEnableLogConsole(bool enabled);
+};
+diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
+--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
+@@ -80,6 +80,8 @@ static_library("renderer") {
+     "chrome_render_thread_observer.cc",
+     "chrome_render_thread_observer.h",
+     "custom_menu_commands.h",
+    "cromite/cromite_private_api_extension.cc",
+    "cromite/cromite_private_api_extension.h",
+     "google_accounts_private_api_extension.cc",
+     "google_accounts_private_api_extension.h",
+     "google_accounts_private_api_util.cc",
+diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
+--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
+@@ -56,6 +56,7 @@
+ #include "chrome/renderer/chrome_render_frame_observer.h"
+ #include "chrome/renderer/chrome_render_thread_observer.h"
+ #include "chrome/renderer/controlled_frame/controlled_frame_extensions_renderer_api_provider.h"
+#include "chrome/renderer/cromite/cromite_private_api_extension.h"
+ #include "chrome/renderer/google_accounts_private_api_extension.h"
+ #include "chrome/renderer/loadtimes_extension_bindings.h"
+ #include "chrome/renderer/media/flash_embed_rewrite.h"
+@@ -645,6 +646,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+ 
+   TrustedVaultEncryptionKeysExtension::Create(render_frame);
+   GoogleAccountsPrivateApiExtension::Create(render_frame);
+  CromitePrivateApiExtension::Create(render_frame);
+ 
+   if (render_frame->IsMainFrame())
+     new webapps::WebPageMetadataAgent(render_frame);
+diff --git a/chrome/renderer/cromite/cromite_private_api_extension.cc b/chrome/renderer/cromite/cromite_private_api_extension.cc
+new file mode 100644
+--- /dev/null
+++ b/chrome/renderer/cromite/cromite_private_api_extension.cc
+@@ -0,0 +1,203 @@
+#include "chrome/renderer/cromite/cromite_private_api_extension.h"
+
+#include "chrome/common/chrome_features.h"
+#include "content/public/common/content_features.h"
+#include "content/public/common/isolated_world_ids.h"
+#include "content/public/renderer/chrome_object_extensions_utils.h"
+#include "content/public/renderer/render_frame.h"
+#include "gin/arguments.h"
+#include "gin/function_template.h"
+#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
+#include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/platform/scheduler/web_agent_group_scheduler.h"
+#include "third_party/blink/public/web/web_local_frame.h"
+#include "v8/include/v8-context.h"
+#include "v8/include/v8-function.h"
+
+namespace {
+
+bool ShouldExposeCromitePrivateApi(
+    content::RenderFrame* render_frame) {
+  DCHECK(render_frame);
+  if (!base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
+    return false;
+
+  GURL origin_url = GURL("chrome://version");
+  const url::Origin& allowed_origin = url::Origin::Create(origin_url);
+
+  const url::Origin origin = render_frame->GetWebFrame()->GetSecurityOrigin();
+  return origin == allowed_origin;
+}
+
+}
+
+CromitePrivateApiExtension::PendingRequest::PendingRequest(
+    v8::Isolate* isolate,
+    v8::Local<v8::Context> context,
+    v8::Local<v8::Promise::Resolver> resolver)
+    : isolate(isolate),
+      context(isolate, context),
+      promise_resolver(isolate, resolver) {}
+
+CromitePrivateApiExtension::PendingRequest::~PendingRequest() = default;
+
+// static
+void CromitePrivateApiExtension::Create(content::RenderFrame* frame) {
+  new CromitePrivateApiExtension(frame);
+}
+
+CromitePrivateApiExtension::CromitePrivateApiExtension(
+    content::RenderFrame* frame)
+    : content::RenderFrameObserver(frame) {}
+
+CromitePrivateApiExtension::~CromitePrivateApiExtension() =
+    default;
+
+void CromitePrivateApiExtension::OnDestruct() {
+  delete this;
+}
+
+void CromitePrivateApiExtension::DidCreateScriptContext(
+    v8::Local<v8::Context> v8_context,
+    int32_t world_id) {
+  if (!render_frame() || world_id != content::ISOLATED_WORLD_ID_GLOBAL) {
+    return;
+  }
+
+  if (ShouldExposeCromitePrivateApi(render_frame())) {
+    InjectScript();
+  }
+}
+
+void CromitePrivateApiExtension::InjectScript() {
+  DCHECK(render_frame());
+
+  blink::WebLocalFrame* web_frame = render_frame()->GetWebFrame();
+  v8::Isolate* isolate = web_frame->GetAgentGroupScheduler()->Isolate();
+  v8::HandleScope handle_scope(isolate);
+  v8::Local<v8::Context> context = web_frame->MainWorldScriptContext();
+  if (context.IsEmpty()) {
+    return;
+  }
+
+  v8::Context::Scope context_scope(context);
+
+  v8::Local<v8::Object> window =
+      content::GetOrCreateObject(isolate, context, "window");
+  v8::Local<v8::Object> oCromiteObject =
+      content::GetOrCreateObject(isolate, context, window, "cromite");
+
+  oCromiteObject
+      ->Set(
+          context, gin::StringToSymbol(isolate, "getComponentData"),
+          gin::CreateFunctionTemplate(
+              isolate, base::BindRepeating(
+                           &CromitePrivateApiExtension::GetComponentData,
+                           weak_ptr_factory_.GetWeakPtr()))
+              ->GetFunction(context)
+              .ToLocalChecked())
+      .Check();
+
+  oCromiteObject
+      ->Set(
+          context, gin::StringToSymbol(isolate, "startComponentUpdate"),
+          gin::CreateFunctionTemplate(
+              isolate, base::BindRepeating(
+                           &CromitePrivateApiExtension::StartComponentUpdate,
+                           weak_ptr_factory_.GetWeakPtr()))
+              ->GetFunction(context)
+              .ToLocalChecked())
+      .Check();
+
+  oCromiteObject
+      ->Set(
+          context, gin::StringToSymbol(isolate, "setEnableLogConsole"),
+          gin::CreateFunctionTemplate(
+              isolate, base::BindRepeating(
+                           &CromitePrivateApiExtension::SetEnableLogConsole,
+                           weak_ptr_factory_.GetWeakPtr()))
+              ->GetFunction(context)
+              .ToLocalChecked())
+      .Check();
+}
+
+void CromitePrivateApiExtension::GetComponentData(gin::Arguments* args) {
+  std::string component_id;
+  if (!args->GetNext(&component_id)) {
+    args->ThrowError();
+    return;
+  }
+
+  if (!remote_.is_bound()) {
+    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
+  }
+
+  v8::Isolate* isolate = args->isolate();
+  v8::Local<v8::Context> context = isolate->GetCurrentContext();
+
+  v8::Local<v8::Promise::Resolver> resolver =
+      v8::Promise::Resolver::New(context).ToLocalChecked();
+  v8::Local<v8::Promise> promise = resolver->GetPromise();
+
+  base::UnguessableToken request_id = base::UnguessableToken::Create();
+  pending_requests_.emplace(
+      request_id,
+      std::make_unique<PendingRequest>(isolate, context, resolver));
+
+  remote_->GetComponentData(component_id,
+      base::BindOnce(&CromitePrivateApiExtension::OnGetComponentData,
+                     weak_ptr_factory_.GetWeakPtr(), request_id));
+
+  args->Return(promise);
+}
+
+void CromitePrivateApiExtension::OnGetComponentData(const base::UnguessableToken callback_id,
+                                                    const std::string& result) {
+  auto iter = pending_requests_.find(callback_id);
+  if (iter == pending_requests_.end())
+    return;
+
+  std::unique_ptr<PendingRequest> request = std::move(iter->second);
+  pending_requests_.erase(iter);
+
+  v8::HandleScope handle_scope(request->isolate);
+  v8::Local<v8::Context> context =
+    request->context.Get(request->isolate);
+  v8::Local<v8::Promise::Resolver> resolver =
+    request->promise_resolver.Get(request->isolate);
+
+  LOG(INFO) << "---CromitePrivateApiExtension::OnGetComponentData4";
+  resolver->Resolve(context,
+                    gin::StringToV8(request->isolate, result))
+      .ToChecked();
+
+  LOG(INFO) << "---CromitePrivateApiExtension::OnGetComponentData5";
+}
+
+void CromitePrivateApiExtension::StartComponentUpdate(gin::Arguments* args) {
+  std::string component_id;
+  if (!args->GetNext(&component_id)) {
+    args->ThrowError();
+    return;
+  }
+
+  if (!remote_.is_bound()) {
+    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
+  }
+
+  remote_->StartComponentUpdate(component_id);
+}
+
+void CromitePrivateApiExtension::SetEnableLogConsole(gin::Arguments* args) {
+  bool enabled;
+  if (!args->GetNext(&enabled)) {
+    args->ThrowError();
+    return;
+  }
+
+  if (!remote_.is_bound()) {
+    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
+  }
+
+  remote_->SetEnableLogConsole(enabled);
+}
+diff --git a/chrome/renderer/cromite/cromite_private_api_extension.h b/chrome/renderer/cromite/cromite_private_api_extension.h
+new file mode 100644
+--- /dev/null
+++ b/chrome/renderer/cromite/cromite_private_api_extension.h
+@@ -0,0 +1,65 @@
+#ifndef CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
+#define CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
+
+#include "base/memory/weak_ptr.h"
+#include "chrome/common/cromite_private_api_extension.mojom.h"
+#include "content/public/renderer/render_frame_observer.h"
+#include "mojo/public/cpp/bindings/associated_remote.h"
+#include "v8/include/v8.h"
+
+namespace gin {
+class Arguments;
+}  // namespace gin
+
+class CromitePrivateApiExtension : public content::RenderFrameObserver {
+ public:
+  // Creates a new instance, with ownership transferred to |*frame|.
+  static void Create(content::RenderFrame* frame);
+
+  CromitePrivateApiExtension(const CromitePrivateApiExtension&) =
+      delete;
+  CromitePrivateApiExtension& operator=(
+      const CromitePrivateApiExtension&) = delete;
+
+  ~CromitePrivateApiExtension() override;
+
+  // content::RenderFrameObserver:
+  void OnDestruct() override;
+  void DidCreateScriptContext(v8::Local<v8::Context> v8_context,
+                              int32_t world_id) override;
+
+ private:
+
+ struct PendingRequest {
+    PendingRequest(
+        v8::Isolate* isolate,
+        v8::Local<v8::Context> context,
+        v8::Local<v8::Promise::Resolver> resolver);
+
+    ~PendingRequest();
+
+    raw_ptr<v8::Isolate> isolate;
+    v8::Global<v8::Context> context;
+    v8::Global<v8::Promise::Resolver> promise_resolver;
+  };
+
+  explicit CromitePrivateApiExtension(content::RenderFrame* frame);
+
+  void InjectScript();
+
+  void GetComponentData(gin::Arguments* args);
+  void OnGetComponentData(const base::UnguessableToken callback_id,
+                          const std::string& label);
+  void StartComponentUpdate(gin::Arguments* args);
+  void SetEnableLogConsole(gin::Arguments* args);
+
+  std::map<const base::UnguessableToken,
+           std::unique_ptr<PendingRequest>> pending_requests_;
+
+  mojo::AssociatedRemote<chrome::mojom::CromitePrivateApiExtension>
+      remote_;
+  base::WeakPtrFactory<CromitePrivateApiExtension> weak_ptr_factory_{
+      this};
+};
+
+#endif  // CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
+diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h
+--- a/components/component_updater/component_updater_service.h
+++ b/components/component_updater/component_updater_service.h
+@@ -242,6 +242,7 @@ class OnDemandUpdater {
+   // the update will be applied. The caller can subscribe to component update
+   // service notifications and provide an optional callback to get the result
+   // of the call. The function does not implement any cooldown interval.
+ public:
+   virtual void OnDemandUpdate(const std::string& id,
+                               Priority priority,
+                               Callback callback) = 0;
+diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc
+--- a/content/browser/devtools/devtools_http_handler.cc
+++ b/content/browser/devtools/devtools_http_handler.cc
+@@ -16,6 +16,7 @@
+ #include "base/command_line.h"
+ #include "base/compiler_specific.h"
+ #include "base/files/file_util.h"
+#include "base/feature_list.h"
+ #include "base/functional/bind.h"
+ #include "base/functional/callback_helpers.h"
+ #include "base/json/json_writer.h"
+@@ -46,6 +47,7 @@
+ #include "content/public/browser/devtools_manager_delegate.h"
+ #include "content/public/browser/devtools_socket_factory.h"
+ #include "content/public/common/content_client.h"
+#include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/url_constants.h"
+ #include "net/base/io_buffer.h"
+@@ -587,9 +589,12 @@ void DevToolsHttpHandler::OnJsonRequest(
+ 
+   if (command == "version") {
+     base::Value::Dict version;
+    auto browser = GetContentClient()->browser()->GetProduct();
+    if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
+      browser = "Chrome/0.0.0.0";
+     version.Set("Protocol-Version", DevToolsAgentHost::GetProtocolVersion());
+     version.Set("WebKit-Version", embedder_support::GetWebKitVersion());
+-    version.Set("Browser", GetContentClient()->browser()->GetProduct());
+    version.Set("Browser", browser);
+     version.Set("User-Agent", GetContentClient()->browser()->GetUserAgent());
+     version.Set("V8-Version", V8_VERSION_STRING);
+     std::string host = info.GetHeaderValue("host");
+diff --git a/content/browser/log_console_message.cc b/content/browser/log_console_message.cc
+--- a/content/browser/log_console_message.cc
+++ b/content/browser/log_console_message.cc
+@@ -17,10 +17,23 @@ void LogConsoleMessage(blink::mojom::ConsoleMessageLevel log_level,
+                        int32_t line_number,
+                        bool is_builtin_component,
+                        bool is_off_the_record,
+-                       const std::u16string& source_id) {
+                       const std::u16string& source_id,
+                       bool is_log_console_enabled) {
+  if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport)) {
+    LOG(INFO) << "CONSOLE:"
+        << "\"" << message << "\", source: " << source_id << " (" << line_number
+        << ")";
+    return;
+  }
+   const int32_t resolved_level =
+       is_builtin_component ? ConsoleMessageLevelToLogSeverity(log_level)
+                            : ::logging::LOGGING_INFO;
+  if (is_log_console_enabled) {
+    logging::LogMessage("CONSOLE", line_number, resolved_level).stream()
+        << "\"" << message << "\", source: " << source_id << " (" << line_number
+        << ")";
+    return;
+  }
+   if (::logging::GetMinLogLevel() > resolved_level)
+     return;
+ 
+diff --git a/content/browser/log_console_message.h b/content/browser/log_console_message.h
+--- a/content/browser/log_console_message.h
+++ b/content/browser/log_console_message.h
+@@ -19,7 +19,8 @@ void LogConsoleMessage(blink::mojom::ConsoleMessageLevel log_level,
+                        int32_t line_number,
+                        bool is_builtin_component,
+                        bool is_off_the_record,
+-                       const std::u16string& source_id);
+                       const std::u16string& source_id,
+                       bool is_log_console_enabled = false);
+ 
+ }  // namespace content
+ 
+diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
+--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
+@@ -319,6 +319,8 @@
+ #include "url/origin.h"
+ #include "url/url_constants.h"
+ 
+//#include "chrome/browser/cromite/cromite_private_api_host.h"
+
+ #if BUILDFLAG(IS_ANDROID)
+ #include "content/browser/accessibility/browser_accessibility_manager_android.h"
+ #include "content/browser/android/content_url_loader_factory.h"
+@@ -4763,7 +4765,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+   if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
+                                         updated_source_id,
+                                         untrusted_stack_trace)) {
+-    return;
+    if (!base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
+      return;
+   }
+ 
+   // Pass through log severity only on builtin components pages to limit console
+@@ -4780,8 +4783,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+   const bool is_off_the_record =
+       GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
+ 
+  bool is_log_console_enabled = false;
+  // CromitePrivateApiHost* cromite_data =
+  //     CromitePrivateApiHost::GetForCurrentDocument(this);
+  // if (cromite_data) {
+  //   is_log_console_enabled = cromite_data->IsLogConsoleEnabled();
+  // }
+   LogConsoleMessage(log_level, message, line_no, is_builtin_component,
+-                    is_off_the_record, updated_source_id);
+                    is_off_the_record, updated_source_id, is_log_console_enabled);
+ }
+ 
+ void RenderFrameHostImpl::FrameSizeChanged(const gfx::Size& frame_size) {
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc b/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+@@ -0,0 +1,19 @@
+#ifdef FLAG_SECTION
+
+    {"enable-cromite-test-support",
+     "Enable support for cromite test",
+     "Setting allows the activation of specific APIs used for cromite testing. "
+     "Do not activate if you do not know what you are doing.", kOsAll,
+     FEATURE_VALUE_TYPE(features::kEnableCromiteTestSupport)},
+
+#if BUILDFLAG(IS_ANDROID)
+
+    {"act-as-webview",
+     "Enable webview support for cromite test",
+     "Setting allows the activation of specific APIs used for cromite testing. "
+     "Do not activate if you do not know what you are doing.", kOsAndroid,
+     FEATURE_VALUE_TYPE(features::kActAsWebView)},
+
+#endif
+
+#endif
+diff --git a/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc b/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+@@ -0,0 +1,7 @@
+CROMITE_FEATURE(kEnableCromiteTestSupport,
+                "EnableCromiteTestSupport",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+
+CROMITE_FEATURE(kActAsWebView,
+                "ActAsWebView",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc b/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+@@ -0,0 +1,2 @@
+CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableCromiteTestSupport);
+CONTENT_EXPORT BASE_DECLARE_FEATURE(kActAsWebView);
+--
@@ -4,6 +4,7 @@ Subject: Add custom tab intents privacy option

 Add custom tab intents privacy option and force
 open external links in incognito flag.
+Use the CCT ephemeral mode.

 Flags are mutually exclusive.

@@ -11,31 +12,41 @@ See also: https://github.com/bromite/bromite/issues/1474

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../java/res/xml/privacy_preferences.xml      | 10 ++++++++
- .../browser/LaunchIntentDispatcher.java       | 21 ++++++++++++++++
- .../customtabs/CustomTabsConnection.java      |  1 +
- .../IncognitoCustomTabIntentDataProvider.java |  6 +++++
- .../privacy/settings/PrivacySettings.java     | 24 +++++++++++++++++++
- .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++++-
- .../strings/android_chrome_strings.grd        | 14 +++++++++++
+ .../java/res/xml/privacy_preferences.xml      | 15 ++++++
+ .../browser/LaunchIntentDispatcher.java       | 21 ++++++++
+ .../CustomTabIntentDataProvider.java          | 22 ++++----
+ .../customtabs/CustomTabsConnection.java      |  3 +-
+ .../IncognitoCustomTabIntentDataProvider.java | 14 +++++
+ .../privacy/settings/PrivacySettings.java     | 51 +++++++++++++++++++
+ .../flags/android/chrome_feature_list.cc      |  2 +-
+ .../browser/flags/ChromeFeatureList.java      |  3 ++
+ .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++-
+ ...Add-custom-tab-intents-privacy-option.grdp | 25 +++++++++
+ .../OriginVerifier.java                       |  5 ++
 .../core/common/language_experiments.cc       |  1 +
 .../add-custom-tab-intents-privacy-option.inc |  1 +
- 9 files changed, 83 insertions(+), 1 deletion(-)
+ 13 files changed, 156 insertions(+), 13 deletions(-)
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -54,6 +54,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" />
+@@ -52,6 +52,21 @@ found in the LICENSE file.
+         android:key="cromite_flags"
+         android:title="@string/cromite_flags_title"
+         app:url="@string/cromite_flags_url" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="allow_custom_tab_intents"
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:title="@string/uses_separate_storagepartition_for_cct_title"
+        android:summary="@string/uses_separate_storagepartition_for_cct_summary"
+        app:featureName="maylaunchurl-uses-separate-storage-partition"
+        app:needRestart="true" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="open_external_links_incognito"
 +        android:title="@string/open_external_links_incognito_title"
 +        android:summary="@string/open_external_links_incognito_summary"
@@ -46,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -52,6 +52,9 @@ import java.lang.annotation.Retention;
+@@ -62,6 +62,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Set;
 
@@ -56,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 /**
  * Dispatches incoming intents to the appropriate activity based on the current configuration and
  * Intent fired.
-@@ -239,6 +242,9 @@ public class LaunchIntentDispatcher {
+@@ -264,6 +267,9 @@ public class LaunchIntentDispatcher {
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
@@ -66,9 +77,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
         Log.w(
                 TAG,
                 "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -260,6 +266,10 @@ public class LaunchIntentDispatcher {
-         newIntent.setData(uri);
-         newIntent.setClassName(context, CustomTabActivity.class.getName());
+@@ -292,6 +298,10 @@ public class LaunchIntentDispatcher {
+         // Make sure the result of the CustomTabActivity is forwarded to the client.
+         newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
 +        if (ContextUtils.getAppSharedPreferences()
 +                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
@@ -77,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
         // Since configureIntentForResizableCustomTab() might change the componenet/class
         // associated with the passed intent, it needs to be called after #setClassName(context,
         // CustomTabActivity.class.getName());
-@@ -407,6 +417,17 @@ public class LaunchIntentDispatcher {
+@@ -489,6 +499,17 @@ public class LaunchIntentDispatcher {
 
         if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                 && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -92,13 +103,79 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 +                IntentHandler.setTabLaunchType(newIntent, TabLaunchType.FROM_EXTERNAL_APP);
 +                newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 +            }
-             if (!chromeTabbedTaskExists()) {
+             if (!chromeTabbedTaskExists(mActivity)) {
                 newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true);
             }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+@@ -236,16 +236,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+ 
+     // Extra whose value is an array of ints that is supplied to
+     // SyntheticTrialRegistry::RegisterExternalExperiments().
+-    public static final String EXPERIMENT_IDS =
+-            "org.chromium.chrome.browser.customtabs.AGA_EXPERIMENT_IDS";
+    // public static final String EXPERIMENT_IDS =
+    //         "org.chromium.chrome.browser.customtabs.AGA_EXPERIMENT_IDS";
+ 
+     // These Extra Intent parameters allow an Intent to enable or disable a set of Features.
+     // The set of Features that may be enabled or disabled is restricted by the code,
+     // and initially only two Features may be enabled together, or disabled together.
+-    public static final String EXPERIMENTS_ENABLE =
+-            "org.chromium.chrome.browser.customtabs.EXPERIMENTS_ENABLE";
+-    public static final String EXPERIMENTS_DISABLE =
+-            "org.chromium.chrome.browser.customtabs.EXPERIMENTS_DISABLE";
+    // public static final String EXPERIMENTS_ENABLE =
+    //         "org.chromium.chrome.browser.customtabs.EXPERIMENTS_ENABLE";
+    // public static final String EXPERIMENTS_DISABLE =
+    //         "org.chromium.chrome.browser.customtabs.EXPERIMENTS_DISABLE";
+ 
+     /**
+      * Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab
+@@ -685,7 +685,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+                                 TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION,
+                                 ScreenOrientation.DEFAULT));
+ 
+-        mGsaExperimentIds = IntentUtils.safeGetIntArrayExtra(intent, EXPERIMENT_IDS);
+        mGsaExperimentIds = null; //IntentUtils.safeGetIntArrayExtra(intent, EXPERIMENT_IDS);
+ 
+         mBreakPointDp = getActivityBreakPointFromIntent(intent);
+         mInitialActivityHeight = getInitialActivityHeightFromIntent(intent);
+@@ -698,8 +698,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+                         intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT);
+         mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED;
+ 
+-        mInteractWithBackground = CustomTabsIntent.isBackgroundInteractionEnabled(intent);
+-        if (IntentUtils.safeHasExtra(intent, EXTRA_ENABLE_BACKGROUND_INTERACTION)) {
+        mInteractWithBackground = false; // CustomTabsIntent.isBackgroundInteractionEnabled(intent);
+        if (((false)) && IntentUtils.safeHasExtra(intent, EXTRA_ENABLE_BACKGROUND_INTERACTION)) {
+             @BackgroundInteractBehavior
+             int backgroundInteractBehavior =
+                     IntentUtils.safeGetIntExtra(
+@@ -1270,7 +1270,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+     public @CustomTabProfileType int getCustomTabMode() {
+         return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
+                 ? CustomTabProfileType.INCOGNITO
+-                : CustomTabProfileType.REGULAR;
+                : (ChromeFeatureList.sMayLaunchurlUsesSeparateStoragePartition.isEnabled()
+                    ? CustomTabProfileType.EPHEMERAL
+                    : CustomTabProfileType.REGULAR);
+     }
+ 
+     @Override
 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
-@@ -854,6 +854,7 @@ public class CustomTabsConnection {
+@@ -776,7 +776,7 @@ public class CustomTabsConnection {
+         ThreadUtils.assertOnUiThread();
+         if (extras == null) return;
+         int[] experimentIds =
+-                IntentUtils.safeGetIntArray(extras, CustomTabIntentDataProvider.EXPERIMENT_IDS);
+                null; //IntentUtils.safeGetIntArray(extras, CustomTabIntentDataProvider.EXPERIMENT_IDS);
+         if (experimentIds == null) return;
+         // When ids are set through cct, they should not override existing ids.
+         boolean override = false;
+@@ -992,6 +992,7 @@ public class CustomTabsConnection {
         PostTask.postTask(
                 TaskTraits.UI_DEFAULT,
                 () -> {
@@ -109,7 +186,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
-@@ -38,6 +38,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -40,6 +40,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -119,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 /**
  * A model class that parses the incoming intent for incognito Custom Tabs specific customization
  * data.
-@@ -115,6 +118,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -121,6 +124,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     private static boolean isIntentFromThirdPartyAllowed() {
@@ -129,20 +206,66 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
         return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
     }
 
+@@ -221,6 +227,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+     }
+ 
+     public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
+        if (ContextUtils.getAppSharedPreferences()
+                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
+            return true;
+        }
+         if (!isIncognitoRequested(intent)) return false;
+         var session = SessionHolder.getSessionHolderFromIntent(intent);
+         if (isIntentFromThirdPartyAllowed()
+@@ -330,6 +340,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+ 
+     @Override
+     public @CustomTabProfileType int getCustomTabMode() {
+        if (ContextUtils.getAppSharedPreferences()
+                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
+            return CustomTabProfileType.EPHEMERAL;
+        }
+         return CustomTabProfileType.INCOGNITO;
+     }
+ 
 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
-@@ -103,6 +103,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -11,6 +11,7 @@ import android.content.Context;
+ import android.content.Intent;
+ import android.content.SharedPreferences;
+ import android.graphics.drawable.Drawable;
+import android.os.Build;
+ import android.os.Bundle;
+ import android.text.SpannableString;
+ import android.text.style.ClickableSpan;
+@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
+ import java.util.concurrent.TimeUnit;
+ import java.util.function.Consumer;
 
-     private IncognitoLockSettings mIncognitoLockSettings;
+import android.app.role.RoleManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+import android.text.TextUtils;
+import org.chromium.base.IntentUtils;
+import org.chromium.base.PackageManagerUtils;
+
+ import androidx.preference.PreferenceCategory;
+ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+ import org.chromium.base.shared_preferences.SharedPreferencesManager;
+@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                 startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
+     }
 
 +    private ChromeSwitchPreference allowCustomTabIntentsPref;
 +    private ChromeSwitchPreference openExternalLinksPref;
 +
     @Override
-     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         getActivity().setTitle(R.string.prefs_privacy_security);
-@@ -298,6 +301,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+         mPageTitle.set(getString(R.string.prefs_privacy_security));
+@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
     }
 
@@ -152,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
-@@ -314,6 +320,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -160,6 +283,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
+            // check default browser
+            if ((boolean)newValue) {
+                ResolveInfo info = PackageManagerUtils.resolveDefaultWebBrowserActivity();
+                if (info == null || info.match == 0 ||
+                    !TextUtils.equals(ContextUtils.getApplicationContext().getPackageName(),
+                                      info.activityInfo.packageName)) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                                RoleManager roleManager = (RoleManager) getContext().getSystemService(Context.ROLE_SERVICE);
+                                Intent intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_BROWSER);
+                                startActivityForResult(intent, 0);
+                        } else {
+                                Intent intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
+                                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                IntentUtils.safeStartActivity(getContext(), intent);
+                        }
+                }
+            }
 +        } else if (PREF_OPEN_EXTERNAL_LINKS_INCOGNITO.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
@@ -167,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -336,6 +350,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -184,10 +324,42 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
         if (doNotTrackPref != null) {
             doNotTrackPref.setSummary(
+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
+@@ -1153,7 +1153,7 @@ BASE_FEATURE(kMagicStackAndroid,
+ // Enables an experimental feature which forces mayLaunchUrl to use a different
+ // storage partition. This may reduce performance. This should not be enabled by
+ // default.
+-BASE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
+CROMITE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
+              "MayLaunchUrlUsesSeparateStoragePartition",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+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
+@@ -991,6 +991,8 @@ public abstract class ChromeFeatureList {
+                     MOST_VISITED_TILES_CUSTOMIZATION,
+                     /* defaultValue= */ false,
+                     /* defaultValueInTests= */ true);
+    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition =
+            newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
+     public static final CachedFlag sMostVisitedTilesReselect =
+             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
+     public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
+@@ -1226,6 +1228,7 @@ public abstract class ChromeFeatureList {
+                     sMiniOriginBar,
+                     sMitigateLegacySearchEnginePromoOverlap,
+                     sMostVisitedTilesCustomization,
+                    sMayLaunchurlUsesSeparateStoragePartition,
+                     sMostVisitedTilesReselect,
+                     sMultiInstanceApplicationStatusCleanup,
+                     sMvcUpdateViewWhenModelChanged,
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
-@@ -87,7 +87,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
+@@ -88,7 +88,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
     public static boolean isOpenedFromExternalApp(Tab tab) {
         TabAssociatedApp app = get(tab);
         if (app == null) return false;
@@ -200,36 +372,57 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
         String packageName = ContextUtils.getApplicationContext().getPackageName();
         return tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP
                 && !TextUtils.equals(app.getAppId(), packageName);
-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
-@@ -5217,6 +5217,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>
-+      <!-- Allow custom tab intents -->
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow custom tab intents
-+      </message>
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow applications to open custom tab intents, similar to webview.
-+      </message>
-+      <!-- Open External Links in Incognito -->
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
+@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <!-- Allow custom tab intents -->
+    <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
+        Allow custom tab intents.
+    </message>
+    <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
+        Allow applications to open custom tab intents, similar to webview. To work, Cromite must be set as the default browser.
+    </message>
+
+    <message name="IDS_USES_SEPARATE_STORAGEPARTITION_FOR_CCT_TITLE" desc="Text for 'Use ephemeral mode for CCT' settings-privacy option.">
+        Use ephemeral mode for CCT
+    </message>
+    <message name="IDS_USES_SEPARATE_STORAGEPARTITION_FOR_CCT_SUMMARY" desc="Summary text for 'Use ephemeral mode for CCT' settings-privacy option.">
+        Use a separate storage partition when opening custom tab intents
+    </message>
+
+    <!-- Open External Links in Incognito -->
+    <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
 +        Open external links in incognito
-+      </message>
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
-+        Force the opening of all external links in incognito mode
-+      </message>
-       <!-- Usage Stats strings -->
-       <message name="IDS_USAGE_STATS_CONSENT_TITLE" desc="Title for activity authorizing Digital Wellbeing to access Chrome usage data">
-         Show your Chrome activity in Digital Wellbeing?
+    </message>
+    <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
+        Force the opening of all external links in incognito mode and uses the CCT ephemeral mode. Caution: there is only one incognito profile.
+    </message>
+</grit-part>
+diff --git a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
+--- a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
+++ b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
+@@ -181,6 +181,11 @@ public abstract class OriginVerifier {
+         assert mNativeOriginVerifier != 0
+                 : "Either provide a browserContextHandle to "
+                         + "OriginVerifier#ctor or call initNativeOriginVerifier.";
+        if ((true)) {
+            PostTask.runOrPostTask(
+                    TaskTraits.UI_DEFAULT, new VerifiedCallback(origin, false, null));
+            return;
+        }
+ 
+         String scheme = origin.uri().getScheme();
+         String host = assumeNonNull(origin.uri().getHost());
 diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc
 --- a/components/language/core/common/language_experiments.cc
 +++ b/components/language/core/common/language_experiments.cc
-@@ -24,4 +24,5 @@ BASE_FEATURE(kCctAutoTranslate,
- // Params:
- const char kContentLanguagesDisableObserversParam[] = "disable_observers";
+@@ -26,4 +26,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
+              "DisableGeoLanguageModel",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kCctAutoTranslate);
 }  // namespace language
@@ -238,5 +431,5 @@ new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides);
+// explicitly empty
 --
@@ -6,88 +6,58 @@ Corrected Exit functionality

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/main_menu.xml                  | 6 ++++++
- .../org/chromium/chrome/browser/ApplicationLifetime.java    | 2 ++
- .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
- .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 5 files changed, 21 insertions(+)
+ chrome/android/java/res/values/ids.xml                     | 1 +
+ .../org/chromium/chrome/browser/ChromeTabbedActivity.java  | 4 ++++
+ .../org/chromium/chrome/browser/app/ChromeActivity.java    | 6 ++++++
+ .../chrome/browser/init/ChromeLifetimeController.java      | 2 ++
+ .../tabbed_mode/TabbedAppMenuPropertiesDelegate.java       | 7 +++++++
+ .../browser/ui/android/strings/android_chrome_strings.grd  | 3 +++
+ 6 files changed, 23 insertions(+)

-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- 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.
-         <item android:id="@+id/managed_by_menu_id"
-             android:title="@string/managed_browser"
-             android:icon="@drawable/ic_business" />
-+        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
-     </group>
+diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
+--- a/chrome/android/java/res/values/ids.xml
+++ b/chrome/android/java/res/values/ids.xml
+@@ -121,6 +121,7 @@ found in the LICENSE file.
+     <item type="id" name="ntp_feed_header_menu_item_toggle_switch" />
 
-     <!-- Items shown only in the tab switcher -->
-@@ -186,6 +189,9 @@ found in the LICENSE file.
-         <item android:id="@id/preferences_id"
-             android:title="@string/menu_settings"
-             android:icon="@drawable/settings_cog" />
-+        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
-     </group>
- 
-     <!-- Items shown only when the tablet has no visible tabs -->
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser;
- import org.jni_zero.CalledByNative;
- 
- import org.chromium.base.ObserverList;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
- 
- /** Watches for when Chrome is told to restart itself. */
- public class ApplicationLifetime {
-@@ -39,6 +40,7 @@ public class ApplicationLifetime {
- 
-     @CalledByNative
-     public static void terminate(boolean restart) {
-+        IncognitoNotificationManager.dismissIncognitoNotification();
-         for (Observer observer : sObservers) {
-             observer.onTerminate(restart);
-         }
+     <!-- App Menu -->
+    <item type="id" name="exit_id" />
+     <item type="id" name="icon_row_menu_id" />
+     <item type="id" name="forward_menu_id" />
+     <item type="id" name="bookmark_this_page_id" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -267,6 +267,8 @@ import java.util.Set;
+@@ -352,6 +352,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
- import java.util.function.DoubleConsumer;
+ import java.util.function.Supplier;
 
-+import org.chromium.chrome.browser.ApplicationLifetime;
+import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +
 /**
  * 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.
-@@ -2935,6 +2937,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
-         } else if (id == R.id.close_tab) {
-             getCurrentTabModel().closeTab(currentTab, true, false, true);
+@@ -3820,6 +3822,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+                     .closeTabs(
+                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
             RecordUserAction.record("MobileTabClosed");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
         } else if (id == R.id.close_all_tabs_menu_id) {
-             // Close both incognito and normal tabs.
-             CloseAllTabsDialog.show(
+             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
+ 
 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
-@@ -62,6 +62,7 @@ import org.chromium.chrome.R;
+@@ -61,6 +61,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.ActivityUtils;
- import org.chromium.chrome.browser.AppHooks;
-+import org.chromium.chrome.browser.ApplicationLifetime;
+import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 import org.chromium.chrome.browser.ChromeActivitySessionTracker;
 import org.chromium.chrome.browser.ChromeApplicationImpl;
 import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2571,6 +2572,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2481,6 +2482,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return true;
         }
 
@@ -99,10 +69,46 @@ 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
+@@ -20,6 +20,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.chrome.browser.BrowserRestartActivity;
+ import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+ 
+ /**
+  * Answers requests to kill and (potentially) restart Chrome's main browser process.
+@@ -76,6 +77,7 @@ class ChromeLifetimeController
+ 
+     @Override
+     public void onTerminate(boolean restart) {
+        IncognitoNotificationManager.dismissIncognitoNotification();
+         mRestartChromeOnDestroy = restart;
+ 
+         // Tell all Chrome Activities to finish themselves.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+@@ -390,6 +390,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+             maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
+             modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
+         }
+
+        modelList.add(new MVCListAdapter.ListItem(
+                AppMenuHandler.AppMenuItemType.STANDARD,
+                buildModelForStandardMenuItem(
+                        R.id.exit_id,
+                        R.string.menu_exit,
+                        shouldShowIconBeforeItem() ? R.drawable.ic_exit_to_app_white_24dp : 0)));
+     }
+ 
+     private Runnable buildUpdateStateChangedObserver() {
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3846,6 +3846,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -4311,6 +4311,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
       <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
         Dark theme
       </message>
@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
 
 #include "base/check_op.h"
 #include "base/containers/contains.h"
@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 #include "base/feature_list.h"
 #include "base/format_macros.h"
 #include "base/functional/bind.h"
-@@ -417,6 +418,15 @@ AutocompleteController::AutocompleteController(
+@@ -569,6 +570,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
-@@ -479,6 +479,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
@@ -58,7 +58,7 @@ diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omn
 diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
 --- a/components/omnibox/browser/search_provider.cc
 +++ b/components/omnibox/browser/search_provider.cc
-@@ -14,6 +14,7 @@
+@@ -17,6 +17,7 @@
 #include "base/base64.h"
 #include "base/feature_list.h"
 #include "base/functional/bind.h"
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 #include "base/functional/callback.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
-@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_private) {
 }
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -79,24 +79,24 @@ 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
-@@ -7,6 +7,8 @@
- #include <stddef.h>
+@@ -11,6 +11,8 @@
 
 #include "base/check_op.h"
+ #include "base/compiler_specific.h"
 +#include "base/containers/contains.h"
 +#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/char_iterator.h"
-@@ -621,6 +623,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -644,6 +646,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())
+     if (chrome_url && !parts.host.is_valid()) {
 +     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
 +         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
       url.append(kChromeUIDefaultHost);
+     }
     FixupPort(trimmed, parts.port, &url);
-     FixupPath(trimmed, parts.path, &url);
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc
 new file mode 100644
 --- /dev/null
@@ -59,7 +59,7 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
-@@ -89,6 +89,7 @@ executable("make_top_domain_list_variables") {
+@@ -90,6 +90,7 @@ executable("make_top_domain_list_variables") {
     "//base:i18n",
     "//components/url_formatter/spoof_checks/common_words:common",
     "//third_party/icu",
@@ -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"
-@@ -168,6 +172,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -186,6 +190,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
 int ClientSocketPoolManager::max_sockets_per_group(
     HttpNetworkSession::SocketPoolType pool_type) {
   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
@@ -45,18 +45,18 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1045,6 +1045,7 @@ component("net") {
-     "//build:chromeos_buildflags",
+@@ -1167,6 +1167,7 @@ component("net") {
+     ":net_deps",
     "//components/miracle_parameter/common",
+     "//components/network_time/time_tracker",
+    "//components/network_session_configurator/common",
     "//net/http:transport_security_state_generated_files",
-+    "//components/network_session_configurator/common"
+     "//third_party/simdutf",
   ]
- 
-   public_deps = [
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -113,6 +113,7 @@
+@@ -115,6 +115,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
-@@ -1388,6 +1389,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1496,6 +1497,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
     return OK;
   }
 
@@ -3,14 +3,231 @@ Date: Tue, 25 May 2021 19:46:14 +0200
 Subject: Add flag to disable external intent requests

 Adds a new flag that allows to control the switch with same name;
-when flag is disabled no external intent will ever be allowed, for any URL.
+when flag is disabled no external intent will ever be allowed,
+for any URL except for the tel: schema.
+This also reverts commit b710cefb53b558a8bcd884f6baf0229ba4225721 and
+enables IntentBlockExternalFormRedirectsNoGesture.

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- ...Add-flag-to-disable-external-intent-requests.inc | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
+ .../java/res/xml/privacy_preferences.xml      |  7 +++-
+ .../customtabs/CustomTabDelegateFactory.java  |  2 ++
+ .../ExternalNavigationDelegateImpl.java       |  4 ++-
+ .../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++
+ ...g-to-disable-external-intent-requests.grdp |  9 +++++
+ .../android/external_intents_features.cc      |  7 +++-
+ .../android/external_intents_features.h       |  1 +
+ .../ExternalIntentsFeatures.java              |  6 ++++
+ .../ExternalNavigationHandler.java            | 21 ++++++++++++
+ ...ag-to-disable-external-intent-requests.inc | 13 ++++++++
+ ...t-Delete-block-external-form-redirects.inc | 15 +++++++++
+ ...ag-to-disable-external-intent-requests.inc |  3 ++
+ 12 files changed, 118 insertions(+), 3 deletions(-)
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.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
+@@ -77,7 +77,12 @@ found in the LICENSE file.
+         android:title="@string/settings_incognito_tab_lock_title"
+         android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
+         android:persistent="false" />
+-
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="allow_external_intent_requests"
+        android:title="@string/allow_external_intent_requests_title"
+        android:summary="@string/allow_external_intent_requests_summary"
+        app:featureName="AllowExternalIntentRequests"
+        app:needRestart="false" />
+     <PreferenceCategory
+         android:key="security_section"
+       android:title="@string/security_section_title" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
+ import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
+ import org.chromium.chrome.browser.flags.ActivityType;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.flags.cromite.sAllowExternalIntentRequests;
+ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
+ import org.chromium.chrome.browser.fullscreen.FullscreenManager;
+ import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
+@@ -152,6 +153,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+ 
+         @Override
+         public boolean shouldDisableAllExternalIntents() {
+            if (!sAllowExternalIntentRequests.getInstance().isEnabled()) return true;
+             return mActivityType == ActivityType.AUTH_TAB
+                     && ChromeFeatureList.sCctAuthTabDisableAllExternalIntents.isEnabled();
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+@@ -25,6 +25,7 @@ import org.chromium.base.PackageManagerUtils;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.ChromeTabbedActivity2;
+import org.chromium.chrome.browser.flags.cromite.sAllowExternalIntentRequests;
+ import org.chromium.chrome.browser.IntentHandler;
+ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
+ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -119,7 +120,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+     @Override
+     public boolean shouldDisableExternalIntentRequestsForUrl(
+             ExternalNavigationParams params, Intent intent) {
+-        return false;
+        if ("tel".equals(params.getUrl().getScheme())) return false;
+        return !sAllowExternalIntentRequests.getInstance().isEnabled();
+     }
+ 
+     @Override
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+@@ -0,0 +1,33 @@
+/*
+    This file is part of Cromite.
+
+    Cromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Cromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.chrome.browser.flags.cromite;
+
+import org.chromium.components.cached_flags.CachedFlag;
+import org.chromium.chrome.browser.flags.ChromeFeatureMap;
+
+public class sAllowExternalIntentRequests {
+    private static final CachedFlag sInstance =
+        new CachedFlag(ChromeFeatureMap.getInstance(),
+            "AllowExternalIntentRequests", false);
+
+    private sAllowExternalIntentRequests() {}
+
+    public static CachedFlag getInstance() {
+        return sInstance;
+    }
+}
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_ALLOW_EXTERNAL_INTENT_REQUESTS_TITLE" desc="">
+        Allow forward URL requests to external intents
+    </message>
+    <message name="IDS_ALLOW_EXTERNAL_INTENT_REQUESTS_SUMMARY" desc="">
+        If disabled, URL requests will never allow redirection to an external intent, such as open application. Caution: since no verification is possible on the information, allows linkage between browser browsing and activity on the application.
+    </message>
+</grit-part>
+diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
+--- a/components/external_intents/android/external_intents_features.cc
+++ b/components/external_intents/android/external_intents_features.cc
+@@ -29,7 +29,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kNavigationCaptureRefactorAndroid,  &kAuxiliaryNavigationStaysInBrowser,
+     &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA,
+     &kAuxiliaryNavigationStaysInPWA};
+-
+ }  // namespace
+ 
+ // Alphabetical:
+@@ -62,7 +61,13 @@ BASE_FEATURE(kAuxiliaryNavigationStaysInPWA,
+              "AuxiliaryNavigationStaysInPWA",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
+                "IntentBlockExternalFormRedirectsNoGesture",
+                base::FEATURE_ENABLED_BY_DEFAULT);
+
+ static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
+  if (ordinal == -1)
+    return reinterpret_cast<jlong>(&kIntentBlockExternalFormRedirectsNoGesture);
+   return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
+ }
+ 
+diff --git a/components/external_intents/android/external_intents_features.h b/components/external_intents/android/external_intents_features.h
+--- a/components/external_intents/android/external_intents_features.h
+++ b/components/external_intents/android/external_intents_features.h
+@@ -9,6 +9,7 @@
+ 
+ namespace external_intents {
+ 
+BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture);
+ BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs);
+ BASE_DECLARE_FEATURE(kBlockFrameRenavigations);
+ BASE_DECLARE_FEATURE(kBlockIntentsToSelf);
+diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+@@ -19,6 +19,12 @@ import org.chromium.build.annotations.NullMarked;
+ @JNINamespace("external_intents")
+ @NullMarked
+ public class ExternalIntentsFeatures {
+    public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME =
+            "IntentBlockExternalFormRedirectsNoGesture";
+
+    public static final ExternalIntentsFeature INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE =
+            new ExternalIntentsFeature(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
+
+     public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
+     public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf";
+     public static final String NAVIGATION_CAPTURE_REFACTOR_ANDROID_NAME =
+diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+@@ -1556,6 +1556,12 @@ public class ExternalNavigationHandler {
+                 || ignoreBackForwardNav(params);
+     }
+ 
+    /** Wrapper of check against the feature to support overriding for testing. */
+    @VisibleForTesting
+    boolean blockExternalFormRedirectsWithoutGesture() {
+        return ExternalIntentsFeatures.INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE.isEnabled();
+    }
+
+     private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
+             ExternalNavigationParams params,
+             Intent targetIntent,
+@@ -1624,6 +1630,21 @@ public class ExternalNavigationHandler {
+             return OverrideUrlLoadingResult.forNoOverride();
+         }
+ 
+        // http://crbug.com/839751: Require user gestures for form submits to external
+        //                          protocols.
+        // TODO(tedchoc): Turn this on by default once we verify this change does
+        //                not break the world.
+        int pageTransitionCore = params.getPageTransition() & PageTransition.CORE_MASK;
+        boolean isFormSubmit = pageTransitionCore == PageTransition.FORM_SUBMIT;
+        boolean isRedirectFromFormSubmit = isFormSubmit && params.isRedirect();
+        if (isRedirectFromFormSubmit && !incomingIntentRedirect && !params.hasUserGesture()
+                && blockExternalFormRedirectsWithoutGesture()) {
+            if (debug()) {
+                Log.i(TAG, "Incoming form intent attempting to redirect without user gesture");
+            }
+            return OverrideUrlLoadingResult.forNoOverride();
+        }
+
+         if (hasInternalScheme(params.getUrl(), targetIntent)
+                 || hasContentScheme(params.getUrl(), targetIntent)
+                 || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
 new file mode 100644
 --- /dev/null
@@ -29,4 +246,32 @@ new file mode 100644
 +#endif
 +
 +#endif
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+@@ -0,0 +1,15 @@
+#if BUILDFLAG(IS_ANDROID)
+
+#ifdef FLAG_SECTION
+
+    {"block-external-form-redirects-no-gesture",
+     "Block intents from form submissions without user gesture",
+     "Require a user gesture that triggered a form submission in order to "
+     "allow for redirecting to an external intent.",
+     kOsAndroid,
+     FEATURE_VALUE_TYPE(
+         external_intents::kIntentBlockExternalFormRedirectsNoGesture)},
+
+#endif
+
+#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kAllowExternalIntentRequests,
+                "AllowExternalIntentRequests",
+                base::FEATURE_DISABLED_BY_DEFAULT);
 --
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -105,6 +105,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
     WebRuntimeFeatures::EnableMediaSession(false);
   }
@@ -59,14 +59,14 @@ new file mode 100644
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -71,6 +71,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
   static void EnableFingerprintingCanvasImageDataNoise(bool);
   static void EnableFluentScrollbars(bool);
   static void EnableFluentOverlayScrollbars(bool);
 +  static void EnableVibration(bool);
 
-   WebRuntimeFeatures() = delete;
- };
+   static void EnableLocalNetworkAccessWebRTC(bool);
+ 
 diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
@@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
 
 // Maximum number of entries in a vibration pattern.
 const unsigned kVibrationPatternLengthMax = 99;
-@@ -109,6 +110,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator,
   // reference to |window| or |navigator| was retained in another window.
   if (!navigator.DomWindow())
     return false;
@@ -104,9 +104,9 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -660,6 +660,10 @@
-       status: {"Android": "stable"},
-       base_feature: "none",
+@@ -1045,6 +1045,10 @@
+     {
+       name: "CompositingDecisionAtAnimationPhaseBoundaries"
     },
 +    {
 +      name: "Vibration",
@@ -7,48 +7,66 @@ Allows build with clangd by suppressing unsupported parameters
 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
 ---
- build/config/compiler/BUILD.gn | 10 +++++++++-
+ build/config/compiler/BUILD.gn | 14 +++++++++++---
 build_overrides/build.gni      |  3 +++
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)

 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
-@@ -1926,7 +1926,6 @@ config("default_warnings") {
-         # TODO(https://crbug.com/1490607): Fix and re-enable.
-         "-Wno-thread-safety-reference-return",
-       ]
+@@ -694,7 +694,7 @@ config("compiler") {
+     # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
+     # It also causes segfault on Linux s390x:
+     # https://github.com/llvm/llvm-project/issues/149511
+-    if (is_linux && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
+    if (is_linux && !skip_clangd_unsupported_options && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
+         current_cpu != "s390x") {
+       cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
+     }
+@@ -1806,7 +1806,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+-  if (use_clang_warning_suppression_file) {
+  if (use_clang_warning_suppression_file && !skip_clangd_unsupported_options) {
+     from_build_root =
+         rebase_path(clang_warning_suppression_file, root_build_dir)
+     inputs = [ clang_warning_suppression_file ]
+@@ -2140,7 +2140,6 @@ config("default_warnings") {
+       # TODO(crbug.com/376641662): Fix and re-enable.
+       "-Wno-nontrivial-memcall",
+     ]
 -
-       cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
-@@ -1938,6 +1937,15 @@ config("default_warnings") {
-           "-Wno-c++11-narrowing-const-reference",
-         ]
-       }
-+      if (skip_clangd_unsupported_options) {
-+        cflags -= [
-+          "-Wno-deprecated-builtins",
-+          "-Wno-thread-safety-reference-return",
-+        ]
-+        cflags_cc -= [
-+          "-Wno-c++11-narrowing-const-reference",
-+        ]
-+      }
+     cflags_cc += [
+       # TODO(crbug.com/328490295): Fix and re-enable for C flags.
+       "-Wenum-compare-conditional",
+@@ -2205,6 +2204,15 @@ config("default_warnings") {
+       ]
     }
 
-     # Some builders, such as Cronet, use a different version of Clang than
+    if (skip_clangd_unsupported_options) {
+      cflags -= [
+        "-Wno-thread-safety-reference-return",
+        "-Wno-nontrivial-memcall",
+      ]
+      cflags_cc -= [
+      ]
+    }
+
+     # Disable the GNU line marker warning when building a target with Icecc,
+     # ccache, or both. This warning appears frequently when compiling
+     # files that use GNU-style line markers with Clang and Icecc. It can
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -58,6 +58,9 @@ declare_args() {
-   # to lack of toolchain support.
-   gtest_enable_absl_printers = !is_nacl
+@@ -54,6 +54,9 @@ declare_args() {
+   # Allows googletest to pretty-print various absl types.
+   gtest_enable_absl_printers = true
 
 +  # Allows clangd builds by suppressing unsupported parameters
 +  skip_clangd_unsupported_options = false
 +
   # Allow projects that wish to stay on C++17 to override Chromium's default.
-   # TODO(crbug.com/1402249): evaluate removing this end of 2023
+   # TODO(crbug.com/40251117): evaluate removing this end of 2023
   use_cxx17 = false
 --
@@ -4,45 +4,30 @@ Subject: Add menu item to view source

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../android/java/res/menu/custom_tabs_menu.xml |  3 +++
- chrome/android/java/res/menu/main_menu.xml     |  3 +++
- .../chrome/browser/ChromeTabbedActivity.java   |  2 ++
- .../chrome/browser/app/ChromeActivity.java     |  5 +++++
- .../appmenu/AppMenuPropertiesDelegateImpl.java | 18 ++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java    |  1 +
- .../android/strings/android_chrome_strings.grd |  4 ++++
- 7 files changed, 36 insertions(+)
+ chrome/android/java/res/values/ids.xml        |  1 +
+ .../chrome/browser/ChromeTabbedActivity.java  |  2 ++
+ .../chrome/browser/app/ChromeActivity.java    |  5 ++++
+ .../AppMenuPropertiesDelegateImpl.java        | 24 +++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java   |  3 +++
+ .../TabbedAppMenuPropertiesDelegate.java      |  3 +++
+ .../strings/android_chrome_strings.grd        |  4 ++++
+ 7 files changed, 42 insertions(+)

-diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
-+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -62,6 +62,9 @@ found in the LICENSE file.
-         <item android:id="@+id/add_to_homescreen_id"
-             android:title="@string/menu_add_to_homescreen"
-             android:orderInCategory="2" />
-+        <item android:id="@+id/view_source_id"
-+            android:title="@string/view_source"
-+            android:orderInCategory="2" />
-         <item android:id="@+id/install_webapp_id"
-             android:title="@string/menu_install_webapp"
-             android:orderInCategory="2" />
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -107,6 +107,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" />
-+        <item android:id="@+id/view_source_id"
-+            android:title="@string/view_source"
-+            android:icon="@drawable/ic_drive_document_24dp" />
-         <item android:id="@+id/install_webapp_id"
-             android:title="@string/menu_install_webapp"
-             android:icon="@drawable/ic_install_webapp" />
+diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
+--- a/chrome/android/java/res/values/ids.xml
+++ b/chrome/android/java/res/values/ids.xml
+@@ -131,6 +131,7 @@ found in the LICENSE file.
+     <item type="id" name="update_menu_id" />
+     <item type="id" name="new_tab_menu_id" />
+     <item type="id" name="new_incognito_tab_menu_id" />
+    <item type="id" name="view_source_id" />
+     <item type="id" name="add_to_group_menu_id" />
+     <item type="id" name="pin_tab_menu_id" />
+     <item type="id" name="unpin_tab_menu_id" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2986,6 +2986,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3884,6 +3884,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2722,6 +2722,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2638,6 +2638,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return doOpenWebApk(currentTab);
         }
 
@@ -69,16 +54,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -576,6 +576,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
- 
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
-+        updateViewSourceMenuItem(menu, currentTab);
- 
-         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
- 
-@@ -1286,6 +1287,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         }
+@@ -974,6 +974,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+         return false;
     }
 
 +    /**
@@ -87,36 +64,58 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 +     * @param menu {@link Menu} for view source.
 +     * @param currentTab      Current tab being displayed.
 +     */
-+    protected void updateViewSourceMenuItem(
-+            Menu menu, Tab currentTab) {
-+        MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
+    protected void buildAddViewSourceItem(
+            MVCListAdapter.ModelList modelList,
+            @Nullable Tab currentTab) {
 +        boolean visible = false;
 +        if (currentTab != null) {
-+                String url = currentTab.getUrl().getSpec();
-+                visible = !url.isEmpty() && !url.startsWith("view-source:");
+            String url = currentTab.getUrl().getSpec();
+            visible = !url.isEmpty() && !url.startsWith("view-source:");
+        }
+        if (visible) {
+            modelList.add(new MVCListAdapter.ListItem(
+                AppMenuHandler.AppMenuItemType.STANDARD,
+                 buildModelForStandardMenuItem(
+                    R.id.view_source_id,
+                    R.string.view_source,
+                    shouldShowIconBeforeItem() ? R.drawable.ic_drive_document_24dp : 0)));
 +        }
-+        viewSourceMenuItem.setVisible(visible);
 +    }
 +
     /**
-      * Updates the request desktop site item's state.
+      * Updates the bookmark item's visibility.
      *
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -294,6 +294,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
- 
-             updateRequestDesktopSiteMenuItem(
-                     menu, currentTab, requestDesktopSiteVisible, isNativePage);
-+            updateViewSourceMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+@@ -370,6 +370,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             modelList.add(buildAddToHomescreenListItem(currentTab, false));
         }
-     }
+ 
+        // Add view source item
+        buildAddViewSourceItem(modelList, currentTab);
+
+         // --- Request Desktop Site ---
+         if (requestDesktopSiteVisible) {
+             MVCListAdapter.ListItem rdsListItem =
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+@@ -338,6 +338,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+             modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
+         }
+ 
+        // Add view source item
+        buildAddViewSourceItem(modelList, currentTab);
+
+         // RDS
+         MVCListAdapter.ListItem rdsListItem =
+                 maybeBuildRequestDesktopSiteListItem(
 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
-@@ -319,6 +319,10 @@ CHAR_LIMIT guidelines:
-         USB
+@@ -321,6 +321,10 @@ CHAR_LIMIT guidelines:
+         Collaboration
       </message>
 
 +      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">
@@ -4,26 +4,23 @@ Subject: Add option to disable snapshots

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../tab_management/TabGridViewBinder.java     | 10 +++--
+ .../tab_management/TabGridViewBinder.java     |  8 +++-
 .../tasks/tab_management/TabProperties.java   |  5 +++
 .../java/res/xml/privacy_preferences.xml      |  5 +++
- .../chrome/browser/app/ChromeActivity.java    |  3 +-
- .../privacy/settings/PrivacySettings.java     | 42 ++++++++++++++++++-
- .../browser/tab_ui/TabContentManager.java     |  6 ++-
+ .../chrome/browser/app/ChromeActivity.java    |  4 +-
+ .../privacy/settings/PrivacySettings.java     | 44 ++++++++++++++++++-
 .../strings/android_chrome_strings.grd        |  8 ++++
- 7 files changed, 72 insertions(+), 7 deletions(-)
+ 6 files changed, 71 insertions(+), 3 deletions(-)

 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -330,9 +330,12 @@ class TabGridViewBinder {
-                         // Adjust bitmap to thumbnail.
-                         TabUtils.setBitmapAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
-                     } else if (isMostRecentRequest) {
-                        // If the most recent request is a null bitmap ensure a placeholder is
-                        // visible.
+@@ -497,7 +497,12 @@ class TabGridViewBinder {
+                     if (result != null) {
+                         TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
+                     } else {
 -                        thumbnail.setImageDrawable(null);
-+                        TabListFaviconProvider.TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
+                        TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
 +                        if (tabFavicon != null) {
 +                            thumbnail.setScaleType(ImageView.ScaleType.CENTER);
 +                            thumbnail.setImageDrawable(
@@ -32,18 +29,18 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                     }
                 };
         if (sThumbnailFetcherForTesting != null) {
-@@ -371,6 +374,7 @@ class TabGridViewBinder {
-             ViewLookupCachingFrameLayout rootView,
-             PropertyModel model,
-             TabListFaviconProvider.TabFavicon favicon) {
+@@ -535,6 +540,7 @@ class TabGridViewBinder {
+      */
+     private static void setFavicon(
+             ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
 +        model.set(TabProperties.FAVICON, favicon);
-         ImageView faviconView = (ImageView) rootView.fastFindViewById(R.id.tab_favicon);
         if (favicon == null) {
             faviconView.setImageDrawable(null);
+             return;
 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
-@@ -64,6 +64,9 @@ public class TabProperties {
+@@ -129,6 +129,9 @@ public class TabProperties {
     public static final WritableBooleanPropertyKey FAVICON_FETCHED =
             new WritableBooleanPropertyKey();
 
@@ -53,26 +50,26 @@ 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<>();
-@@ -165,6 +168,7 @@ public class TabProperties {
+@@ -223,6 +226,7 @@ public class TabProperties {
                 CARD_TYPE,
-                 CONTENT_DESCRIPTION_STRING,
-                 CLOSE_BUTTON_DESCRIPTION_STRING,
+                 CONTENT_DESCRIPTION_TEXT_RESOLVER,
+                 ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
 +                FAVICON,
-                 SHOPPING_PERSISTED_TAB_DATA_FETCHER,
-                 SHOULD_SHOW_PRICE_DROP_TOOLTIP,
                 QUICK_DELETE_ANIMATION_STATUS,
-@@ -178,6 +182,7 @@ public class TabProperties {
-                 TAB_CLOSED_LISTENER,
+                 TAB_GROUP_COLOR_VIEW_PROVIDER,
+                 TAB_GROUP_CARD_COLOR,
+@@ -263,6 +267,7 @@ public class TabProperties {
+                 TAB_ACTION_BUTTON_DATA,
                 FAVICON_FETCHED,
                 FAVICON_FETCHER,
 +                FAVICON,
                 IS_SELECTED,
                 TITLE,
-                 TABSTRIP_FAVICON_BACKGROUND_COLOR_ID,
+                 HAS_NOTIFICATION_BUBBLE
 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
-@@ -65,6 +65,11 @@ found in the LICENSE file.
+@@ -73,6 +73,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,54 +84,65 @@ 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;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -150,6 +150,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
 import org.chromium.chrome.browser.printing.TabPrinter;
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
 import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.profiles.ProfileProvider;
- import org.chromium.chrome.browser.readaloud.ReadAloudController;
-@@ -730,7 +731,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -653,7 +654,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                     new TabContentManager(
                             this,
                             mBrowserControlsManagerSupplier.get(),
-                            !SysUtils.isLowEndDevice(),
-+                            !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
-                             tabModelSelector != null ? tabModelSelector::getTabById : null));
+-                            /* snapshotsEnabled= */ true,
+                            !TabUiFeatureUtilities.shouldUseListMode()
+                                && !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
+                             tabModelSelector != null ? tabModelSelector::getTabById : null,
+                             TabWindowManagerSingleton.getInstance()));
 
-             getBrowserControlsManager()
 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
-@@ -68,12 +68,25 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -28,6 +28,7 @@ import org.chromium.base.ContextUtils;
+ import org.chromium.base.IntentUtils;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.metrics.RecordUserAction;
+import org.chromium.base.supplier.Supplier;
+ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplierImpl;
+ import org.chromium.build.annotations.NullMarked;
+@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
 +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.ApplicationLifetime;
+import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +
 import java.util.ArrayList;
 import java.util.List;
 
 /** Fragment to keep track of the all the privacy related preferences. */
+ @NullMarked
 public class PrivacySettings extends ChromeBaseSettingsFragment
 -        implements Preference.OnPreferenceChangeListener {
 +        implements Preference.OnPreferenceChangeListener, INeedSnackbarManager {
-+    private SnackbarManager mSnackbarManager;
+
+    private Supplier<SnackbarManager> mSnackbarManagerSupplier;
 +    private Snackbar mSnackbar;
 +
 +    @Override
-+    public void setSnackbarManager(SnackbarManager manager) {
-+        mSnackbarManager = manager;
+    public void setSnackbarManagerSupplier(Supplier<SnackbarManager> manager) {
+        mSnackbarManagerSupplier = manager;
 +    }
 +
     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";
-@@ -155,6 +168,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             }
         }
 
@@ -148,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +                                ApplicationLifetime.terminate(true);
 +                        }
 +                }, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_UNKNOWN)
-+                .setSingleLine(false)
+                .setDefaultLines(false)
 +                .setAction(getActivity().getString(R.string.relaunch),
 +                        /*actionData*/null)
 +                .setDuration(/*durationMs*/70000);
@@ -156,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
         // Record the launch of PG from the S&P link-row entry point
         privacyGuidePreference.setOnPreferenceClickListener(
-@@ -345,6 +373,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -441,6 +471,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
 
     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
     public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -164,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -370,6 +399,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
             sharedPreferencesEditor.apply();
@@ -172,13 +180,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_TABGRID_USE_ICONS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-+            if (!mSnackbarManager.isShowing()) {
-+                mSnackbarManager.showSnackbar(mSnackbar);
+            if (!mSnackbarManagerSupplier.get().isShowing()) {
+                mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
 +            }
         }
         return true;
     }
-@@ -418,6 +454,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             : R.string.text_off);
         }
 
@@ -189,26 +197,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/1444782): Remove forceUpdate and writeBack params once the following features
-         // launch:
-         // * GridTabSwitcherAndroidAnimations
 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
-@@ -5427,6 +5427,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -6146,6 +6146,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
         Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
       </message>
 
@@ -217,7 +209,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +        Use only icons in the tab grid
 +      </message>
 +      <message name="IDS_TABGRID_USE_ICONS_SUMMARY" desc="Summary text for 'Use icons in the tab grid' settings-privacy option.">
-+        Disable the saving of snapshots to disk
+        Disable saving snapshots to disk (even for incognito sessions)
 +      </message>
 +
       <!-- Tab Group Tab Switcher strings -->
@@ -4,68 +4,46 @@ Subject: Add option to force tablet UI

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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 ++++-
- .../browser/tasks/ReturnToChromeUtil.java     |  4 ++-
- .../chrome/browser/ui/RootUiCoordinator.java  |  5 +++-
+ .../java/res/values-sw600dp/dimens.xml        |  4 ++--
+ chrome/android/java/res/values/dimens.xml     |  6 +++++-
+ .../browser/ChromeBaseAppCompatActivity.java  |  3 +++
+ .../chrome/browser/WarmupManager.java         |  5 ++++-
+ .../ChromeAccessibilitySettingsDelegate.java  | 19 ++++++++++++++++++
+ .../chrome/browser/app/ChromeActivity.java    |  4 +++-
+ .../overlays/strip/StripLayoutHelper.java     | 10 ++++++++--
+ .../strip/StripLayoutHelperManager.java       |  6 +++++-
+ .../scene_layer/TabStripSceneLayer.java       |  8 ++++++++
+ .../init/ChromeBrowserInitializer.java        |  2 ++
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +++-
+ .../chrome/browser/ui/RootUiCoordinator.java  |  6 +++++-
 chrome/browser/preferences/BUILD.gn           |  1 +
 .../preferences/ChromePreferenceKeys.java     |  1 +
- .../preferences/ChromeSharedPreferences.java  |  8 ++++++
+ .../preferences/ChromeSharedPreferences.java  | 12 +++++++++++
 .../LegacyChromePreferenceKeys.java           |  1 +
- .../SingleTabSwitcherOnNtpMediator.java       |  3 +-
+ .../AppHeaderCoordinator.java                 |  2 ++
 .../omnibox/LocationBarCoordinator.java       |  2 +-
- .../strings/android_chrome_strings.grd        |  7 +++++
- .../java/res/layout/control_container.xml     | 12 ++++----
+ .../strings/android_chrome_strings.grd        |  7 +++++++
+ .../java/res/layout/control_container.xml     |  8 ++++----
 .../java/res/layout/toolbar_tablet.xml        |  2 +-
- .../java/res/values-sw600dp/dimens.xml        |  5 ++--
- .../toolbar/java/res/values/dimens.xml        |  5 ++--
+ .../java/res/values-sw600dp/dimens.xml        |  5 +++--
+ .../toolbar/java/res/values/dimens.xml        |  6 ++++--
 .../browser/toolbar/ControlContainer.java     |  2 +-
- .../browser/toolbar/ToolbarFeatures.java      |  4 ++-
- .../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 ++++++
- 34 files changed, 174 insertions(+), 35 deletions(-)
+ .../toolbar/top/ToolbarControlContainer.java  | 20 ++++++++++++++++++-
+ .../browser/toolbar/top/ToolbarLayout.java    |  5 ++++-
+ .../tab_strip/HeightTransitionHandler.java    |  2 ++
+ .../TabStripTransitionCoordinator.java        |  6 +++++-
+ .../res/xml/accessibility_preferences.xml     |  5 +++++
+ .../accessibility/AccessibilitySettings.java  | 13 ++++++++++++
+ .../AccessibilitySettingsDelegate.java        |  2 ++
+ .../chromium/ui/base/DeviceFormFactor.java    | 14 +++++++++++++
+ 34 files changed, 171 insertions(+), 26 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
-@@ -100,6 +100,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;
-@@ -1134,7 +1135,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.
+@@ -31,7 +31,7 @@ found in the LICENSE file.
             android:id="@+id/find_toolbar_stub"
             android:inflatedId="@+id/find_toolbar"
             android:visibility="gone"
@@ -99,52 +77,58 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
 +    <dimen name="control_container_height_tabletui">96dp</dimen>
 
     <!-- NTP dimensions -->
-     <dimen name="ntp_search_box_transition_length">60dp</dimen>
+     <dimen name="ntp_search_box_transition_start_offset">60dp</dimen>
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -123,9 +123,13 @@ found in the LICENSE file.
+@@ -119,9 +119,13 @@ found in the LICENSE file.
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 
     <!-- Should match toolbar_height_no_shadow -->
-    <dimen name="control_container_height">56dp</dimen>
-+    <dimen name="control_container_height_cromite">56dp</dimen>
+-    <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">56dp</dimen>
+     <dimen name="custom_tabs_control_container_height">@dimen/default_action_bar_height</dimen>
 
 +    <!-- The combined height of the tab strip and toolbar. -->
 +    <dimen name="tab_strip_and_toolbar_height_cromite">56dp</dimen>
 +
     <!-- Find in Page dimensions -->
     <dimen name="find_in_page_popup_width">375dp</dimen>
-     <dimen name="find_in_page_popup_height">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
-@@ -2265,7 +2265,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+     <dimen name="find_in_page_popup_height">64dp</dimen>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
+@@ -62,6 +62,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
+import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController;
+ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+ import org.chromium.components.browser_ui.util.AutomotiveUtils;
+@@ -142,6 +143,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
+     protected void attachBaseContext(Context newBase) {
+         super.attachBaseContext(newBase);
 
-     @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
+        ChromeSharedPreferences.warmUp();
+
+         // Make sure the "chrome" split is loaded before checking if ClassLoaders are equal.
+         SplitChromeApplication.finishPreload(CHROME_SPLIT_NAME);
+         ClassLoader chromeModuleClassLoader = ChromeBaseAppCompatActivity.class.getClassLoader();
 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
-@@ -51,6 +51,7 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
+ import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.WebContents;
- import org.chromium.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;
- 
-@@ -384,7 +385,9 @@ public class WarmupManager {
-                     (ControlContainer) mainView.findViewById(R.id.control_container);
+ import org.chromium.url.GURL;
+@@ -472,7 +473,9 @@ public class WarmupManager {
+             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
 
             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
 -                controlContainer.initWithToolbar(toolbarId);
@@ -154,66 +138,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
             }
             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
+@@ -65,6 +65,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
         }
     }
 
 +    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
 +        @Override
-+        public boolean isEnabled() {
+        public boolean getValue() {
 +            return ChromeSharedPreferences.getInstance().readBoolean(
 +                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false);
 +        }
 +
 +        @Override
-+        public void setEnabled(boolean value) {
+        public void setValue(boolean value) {
 +            ChromeSharedPreferences.getInstance().writeBoolean(
 +                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value);
 +        }
@@ -230,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -874,7 +874,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -803,7 +803,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             // Inflate the correct toolbar layout for the device.
             int toolbarLayoutId = getToolbarLayoutId();
             if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -244,17 +184,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -69,6 +69,7 @@ import org.chromium.chrome.browser.tasks.tab_management.TabUiThemeUtil;
- import org.chromium.components.browser_ui.styles.ChromeColors;
- import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+@@ -130,6 +130,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+ import org.chromium.components.tab_group_sync.TriggerSource;
 import org.chromium.components.tab_groups.TabGroupColorId;
+ import org.chromium.ui.accessibility.AccessibilityState;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.interpolators.Interpolators;
-@@ -4576,8 +4577,13 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
-         mTabMenu.setAnchorView(tabView);
-         // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
+ import org.chromium.ui.util.ColorUtils;
+@@ -5147,8 +5148,13 @@ public class StripLayoutHelper
+         mCloseButtonMenu.setAnchorView(tabView);
+         // 3. Set the vertical offset to align the close button menu with bottom of the tab strip
         int tabHeight = mManagerHost.getHeight();
 -        int verticalOffset =
 -                -(tabHeight - (int) mContext.getResources().getDimension(R.dimen.tab_strip_height));
@@ -265,13 +205,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 +                (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_tabletui);
 +        }
 +        int verticalOffset = -(tabHeight - tab_strip_height);
-         mTabMenu.setVerticalOffset(verticalOffset);
+         mCloseButtonMenu.setVerticalOffset(verticalOffset);
 
-         // 4. Set the horizontal offset to align the tab menu with the right side of the tab
+         // 4. Set the horizontal offset to align the close button menu with the right side of the
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.ui.system.StatusBarColorController;
+@@ -105,6 +105,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -279,10 +219,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
-@@ -396,11 +397,15 @@ public class StripLayoutHelperManager
- 
+@@ -498,7 +499,10 @@ public class StripLayoutHelperManager
         mIsLayoutOptimizationsEnabled =
-                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
+                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
+                         /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
 -        mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
 +        mScrollableStripHeight =
 +            (DeviceFormFactor.isForceTabletUI()
@@ -291,37 +231,70 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
         mHeight =
                 mIsLayoutOptimizationsEnabled
                         ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
-                         : mScrollableStripHeight;
-+
-         mTopPadding = mHeight - mScrollableStripHeight;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+@@ -120,6 +120,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
+         if (mNativePtr == 0) return;
+         final boolean visible = yOffset > -layoutHelper.getHeight();
 
-         CompositorOnClickHandler selectorClickHandler = time -> handleModelSelectorButtonClick();
-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
-@@ -933,7 +933,9 @@ public final class ReturnToChromeUtil {
-         // TODO(b/331667743): Clean up the flag for scrollable mvt while cleaning up surface polish
-         // code.
-         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.
+        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(ContextUtils.getApplicationContext())) {
+                TintedCompositorButton newTabButton = layoutHelper.getNewTabButton();
+                if (newTabButton.isVisible()) {
+                   rightPaddingDp += newTabButton.getWidth() + layoutHelper.getNewTabBtnVisualOffset()
+                        + StripLayoutGroupTitle.REORDER_BACKGROUND_PADDING_END;
+                }
+        }
+
+         // This will hide the tab strips if necessary.
+         TabStripSceneLayerJni.get()
+                 .beginBuildingFrame(mNativePtr, visible, resourceManager, layerTitleCache);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+@@ -18,6 +18,7 @@ import org.chromium.base.task.TaskTraits;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.profiles.ProfileManager;
+ import org.chromium.chrome.browser.signin.SigninCheckerProvider;
+ import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
+@@ -109,6 +110,7 @@ public class ChromeBrowserInitializer {
+     public void handlePreNativeStartupAndLoadLibraries(final BrowserParts parts) {
+         ThreadUtils.checkUiThread();
+         if (parts.isActivityFinishingOrDestroyed()) return;
+        ChromeSharedPreferences.warmUp();
+         ProcessInitializationHandler.getInstance().initializePreNative();
+         ProcessInitializationHandler.getInstance().initializePreNativeLibraryLoad();
+         try (TraceEvent e = TraceEvent.scoped("ChromeBrowserInitializer.preInflationStartup")) {
+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
+@@ -762,7 +762,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+ 
+     @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/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
-@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -107,6 +107,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
 import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
 import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.pdf.PdfPage;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
+import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -1630,7 +1631,9 @@ public class RootUiCoordinator
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
+@@ -1715,7 +1717,9 @@ public class RootUiCoordinator
         if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
 
         int stubId = R.id.find_toolbar_stub;
@@ -335,8 +308,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
-@@ -26,6 +26,7 @@ android_library("java") {
-     "//components/browser_ui/site_settings/android:constants_java",
+@@ -25,6 +25,7 @@ android_library("java") {
+     "//components/cached_flags:java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/jni_zero:jni_zero_java",
 +    "//ui/android:ui_java",
@@ -346,10 +319,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
-@@ -264,6 +264,7 @@ public final class ChromePreferenceKeys {
-             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
- 
-     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
+@@ -321,6 +321,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";
 +    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";
 
     /** Keys used to save settings related to homepage. */
@@ -357,16 +330,16 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
-@@ -12,6 +12,8 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
- import org.chromium.build.BuildConfig;
- import org.chromium.build.annotations.AssumeNonNull;
+@@ -14,6 +14,8 @@ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.build.annotations.OptimizeAsNonNull;
 
 +import org.chromium.ui.base.DeviceFormFactor;
 +
 @JNINamespace("android::shared_preferences")
+ @NullMarked
 public class ChromeSharedPreferences {
-     public static final PreferenceKeyRegistry REGISTRY =
-@@ -23,6 +25,12 @@ public class ChromeSharedPreferences {
+@@ -26,6 +28,16 @@ public class ChromeSharedPreferences {
                             LegacyChromePreferenceKeys.getPrefixesInUse())
                     : null);
 
@@ -375,6 +348,10 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 +            ChromeSharedPreferences.getInstance().readBoolean(
 +                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false));
 +    }
+
+    public static void warmUp() {
+        // intentionally empty
+    }
 +
     /**
      * @return The //base SharedPreferencesManager singleton.
@@ -382,38 +359,37 @@ 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
-@@ -58,6 +58,7 @@ public class LegacyChromePreferenceKeys {
+@@ -56,6 +56,7 @@ public class LegacyChromePreferenceKeys {
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE,
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP,
                 ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
-                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
-                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
 +                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,
-                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
+                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
-diff --git a/chrome/browser/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;
+diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
+--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
+++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
+@@ -42,6 +42,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
+ import org.chromium.ui.display.DisplayUtil;
+ import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
+ import org.chromium.ui.insets.CaptionBarInsetsRectProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.url.GURL;
+ import org.chromium.ui.insets.InsetObserver;
+ import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer;
+ import org.chromium.ui.insets.InsetsRectProvider;
+@@ -280,6 +281,7 @@ public class AppHeaderCoordinator
+             InsetsRectProvider insetsRectProvider,
+             @DesktopWindowHeuristicResult int currentResult,
+             boolean isOnExternalDisplay) {
+        if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW;
+         @DesktopWindowHeuristicResult int newResult;
 
-@@ -90,7 +91,7 @@ public class SingleTabSwitcherOnNtpMediator implements ConfigurationChangedObser
-         mSingleTabCardClickedCallback = singleTabCardClickedCallback;
-         mIsSurfacePolishEnabled = tabContentManager != null;
-         mUiConfig = uiConfig;
-        mIsTablet = isTablet;
-+        mIsTablet = isTablet && !DeviceFormFactor.isForceTabletUI();
-         mModuleDelegate = moduleDelegate;
- 
-         mMarginNarrowWindowOnTablet =
+         Insets captionBarInset = insetsRectProvider.getCachedInset();
 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
-@@ -768,7 +768,7 @@ public class LocationBarCoordinator
+@@ -862,7 +862,7 @@ public class LocationBarCoordinator
     }
 
     private boolean isTabletWindow() {
@@ -425,8 +401,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
-@@ -1618,6 +1618,13 @@ Your Google account may have other forms of browsing history like searches and a
-         Hide your IP address
+@@ -1483,6 +1483,13 @@ Your Google account may have other forms of browsing history like searches and a
+         Privacy guide explanation closed
       </message>
 
 +      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
@@ -446,30 +422,28 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
     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" >
+-    android:minHeight="@dimen/control_container_height">
+    android:minHeight="@dimen/control_container_height_cromite">
 
     <view
-         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
+         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceCoordinatorLayout"
@@ -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_marginBottom="@dimen/toolbar_hairline_height"
             android:layout_height="@dimen/toolbar_height_no_shadow" />
 
-         <ImageView
-@@ -28,7 +28,7 @@ found in the LICENSE file.
-             android:src="@drawable/toolbar_hairline"
+@@ -29,13 +29,13 @@ found in the LICENSE file.
             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" />
+             app:layout_anchorGravity="bottom"
+-            />
+            android:layout_marginTop="@dimen/control_container_height_cromite" />
 
-@@ -36,7 +36,7 @@ found in the LICENSE file.
+         <ViewStub
             android:id="@+id/find_toolbar_stub"
             android:inflatedId="@+id/find_toolbar"
             android:visibility="gone"
@@ -478,23 +452,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
             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
@@ -523,8 +480,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xm
 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>
+@@ -10,8 +10,10 @@ found in the LICENSE file.
+     <dimen name="toolbar_tab_count_text_size_2_digit">9dp</dimen>
 
     <!-- Tab Strip Dimensions -->
 -    <dimen name="tab_strip_height">0dp</dimen>
@@ -532,14 +489,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 +    <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>
+    <dimen name="tab_strip_reserved_top_padding_tabletui">2dp</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
+     <dimen name="ntp_search_box_height">64dp</dimen>
+     <dimen name="ntp_search_box_height_tall">72dp</dimen>
 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.
+@@ -26,7 +26,7 @@ public interface ControlContainer {
+      *
      * @param toolbarLayoutId The ID of the toolbar layout to use.
      */
 -    void initWithToolbar(int toolbarLayoutId);
@@ -547,54 +505,21 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 
     /**
      * @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/ToolbarFeatures.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.toolbar;
- import androidx.annotation.OptIn;
- import androidx.core.os.BuildCompat;
- 
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.base.ResettersForTesting;
- import org.chromium.base.cached_flags.BooleanCachedFieldTrialParameter;
- import org.chromium.base.cached_flags.IntCachedFieldTrialParameter;
-@@ -71,7 +72,8 @@ public final class ToolbarFeatures {
-      *     is enabled.
-      */
-     public static boolean isDynamicTopChromeEnabled() {
-        return ChromeFeatureList.sDynamicTopChrome.isEnabled();
-+        return ChromeFeatureList.sDynamicTopChrome.isEnabled()
-+                && !DeviceFormFactor.isForceTabletUI();
-     }
- 
-     /** Returns if we are using optimized window layout for tab strip. */
-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
-@@ -144,7 +144,7 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks {
-         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;
+@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.toolbar.top;
+ import static org.chromium.build.NullUtil.assumeNonNull;
 
 import android.content.Context;
 +import android.content.res.Resources;
 import android.graphics.Canvas;
+ import android.graphics.Color;
 import android.graphics.PorterDuff;
- import android.graphics.Rect;
-@@ -112,8 +113,33 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
-     }
+@@ -165,8 +166,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
 
     @Override
+     @Initializer
 -    public void initWithToolbar(int toolbarLayoutId) {
 +    public void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId) {
         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -614,30 +539,22 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 +                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);
+             mToolbarContainer = findViewById(R.id.toolbar_container);
             ViewStub toolbarStub = findViewById(R.id.toolbar_stub);
+             toolbarStub.setLayoutResource(toolbarLayoutId);
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.HostSurface;
- import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
- import org.chromium.ui.UiUtils;
+@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+ import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.base.ViewUtils;
+ import org.chromium.ui.util.MotionEventUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.util.TokenHolder;
 import org.chromium.url.GURL;
 
-@@ -588,7 +589,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -581,7 +582,9 @@ public abstract class ToolbarLayout extends FrameLayout
      * not have a tab strip.
      */
     protected int getTabStripHeightFromResource() {
@@ -648,42 +565,54 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
     }
 
     /** 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
-@@ -69,7 +69,7 @@ if (is_ios) {
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
+@@ -30,6 +30,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
+ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
+ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
+ import org.chromium.ui.base.ViewUtils;
+import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
+ import org.chromium.ui.util.TokenHolder;
 
- # Omit Lacros because it allows //components to depend on //chrome, which in
- # turn depends on //extensions.
-if (!is_chromeos_lacros) {
-+if (!is_chromeos_lacros && !is_android) {
-   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
-@@ -839,7 +839,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.
-  if (!is_chromeos_lacros) {
-+  if (!is_chromeos_lacros  && !is_android) {
-     assert_no_deps = [ "//chrome/*" ]
-     assert_no_deps += disallowed_extension_deps_
-   }
-@@ -1124,7 +1124,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.
-    if (!is_chromeos_lacros) {
-+    if (!is_chromeos_lacros  && !is_android) {
-       assert_no_deps = [ "//chrome/*" ]
-       assert_no_deps += disallowed_extension_deps_
+@@ -562,6 +563,7 @@ class HeightTransitionHandler {
+         if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
+             return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
+         }
+        if (DeviceFormFactor.isForceTabletUI()) return 0;
+         return TRANSITION_THRESHOLD_DP;
     }
+ 
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+ import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver;
+import org.chromium.ui.base.DeviceFormFactor;
+ 
+ /** Class used to manage tab strip visibility and height updates. */
+ @NullMarked
+@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+         mTabStripReservedTopPadding =
+                 controlContainerView()
+                         .getResources()
+-                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding);
+                        .getDimensionPixelSize(
+                            DeviceFormFactor.isForceTabletUI()
+                                ? R.dimen.tab_strip_reserved_top_padding_tabletui
+                                : R.dimen.tab_strip_reserved_top_padding_cromite);
+ 
+         mOnLayoutChangedListener =
+                 (view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
 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
-@@ -40,6 +40,11 @@ found in the LICENSE file.
-         android:summary="@string/reader_for_accessibility_summary"
-         android:title="@string/reader_for_accessibility_title" />
+@@ -41,6 +41,11 @@ found in the LICENSE file.
+         android:summary="@string/jump_start_omnibox_summary"
+         android:title="@string/jump_start_omnibox_title" />
 
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="force_tablet_ui"
@@ -693,42 +622,70 @@ 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
+@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
+ import org.chromium.content_public.browser.ContentFeatureMap;
+ 
+ import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
+import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
+ 
+ /** Fragment to keep track of all the accessibility related preferences. */
+ @NullMarked
+@@ -44,6 +45,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public static final String PREF_ZOOM_INFO = "zoom_info";
+     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
+ 
+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
+
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -108,6 +112,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+                 mDelegate.getReaderAccessibilityDelegate().getValue());
+         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
+ 
+        ChromeSwitchPreference forceTabletUiPref =
+                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.getValue());
+        forceTabletUiPref.setOnPreferenceChangeListener(this);
+
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -167,6 +177,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public boolean onPreferenceChange(Preference preference, Object newValue) {
+         if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
+             mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);
+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
+            mForceTabletUIDelegate.setValue((Boolean) newValue);
+            mDelegate.requestRestart(getActivity());
+         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
+             boolean readerModeEnabled = (Boolean) newValue;
+             mDelegate.getReaderAccessibilityDelegate().setValue(readerModeEnabled);
 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. */
+@@ -41,6 +41,8 @@ public interface AccessibilitySettingsDelegate {
+      */
     BrowserContextHandle getBrowserContextHandle();
 
 +    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.
+      * @return boolean value specifying if the Image Descriptions user setting should be shown.
+      */
 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 {
-     /** Matches the value set in res/values-sw720dp/values.xml */
-     private static final int SCREEN_BUCKET_LARGET_TABLET = 3;
+@@ -70,6 +70,14 @@ public class DeviceFormFactor {
+     /** See {@link #setIsTabletForTesting(boolean)}. */
+     private static @Nullable Boolean sIsTabletForTesting;
 
-+    private static boolean mForceTabletUI = true;
+    private static boolean mForceTabletUI = false;
 +    public static void setForceTabletUI(boolean forceTabletUI) {
 +        mForceTabletUI = forceTabletUI;
 +    }
@@ -738,13 +695,53 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
 +
     /**
      * Each activity could be on a different display, and this will just tell you whether the
-      * display associated with the application context is "tablet sized".
-@@ -56,6 +64,7 @@ public class DeviceFormFactor {
-      *         E.g. http://developer.samsung.com/samsung-dex/testing
+      * display associated with the application context is "tablet sized". Use {@link
+@@ -78,6 +86,7 @@ public class DeviceFormFactor {
+     @CalledByNative
+     @Deprecated
+     public static boolean isTablet() {
+        if (mForceTabletUI) return true;
+         if (sIsTabletForTesting != null) {
+             return sIsTabletForTesting;
+         }
+@@ -108,6 +117,7 @@ public class DeviceFormFactor {
+      *     E.g. http://developer.samsung.com/samsung-dex/testing
      */
     public static boolean isNonMultiDisplayContextOnTablet(Context context) {
 +        if (mForceTabletUI) return true;
         return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
     }
 
+@@ -142,6 +152,7 @@ public class DeviceFormFactor {
+      * @return The screen width bucket the device is in (see constants at the top of this class).
+      */
+     private static int detectScreenWidthBucket(Context context) {
+        if (mForceTabletUI) return SCREEN_BUCKET_TABLET;
+         return context.getResources().getInteger(R.integer.min_screen_width_bucket);
+     }
+ 
+@@ -149,6 +160,7 @@ public class DeviceFormFactor {
+         ThreadUtils.assertOnUiThread();
+         Context context = windowAndroid.getContext().get();
+         if (context == null) return 0;
+        if (mForceTabletUI) return SCREEN_BUCKET_TABLET;
+         return context.getResources().getInteger(R.integer.min_screen_width_bucket);
+     }
+ 
+@@ -158,6 +170,7 @@ public class DeviceFormFactor {
+      */
+     @UiThread
+     public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
+        if (mForceTabletUI) return 0;
+         return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
+     }
+ 
+@@ -166,6 +179,7 @@ public class DeviceFormFactor {
+      *         layout.
+      */
+     public static int getMinimumTabletWidthPx(DisplayAndroid display) {
+        if (mForceTabletUI) return 0;
+         return DisplayUtil.dpToPx(display, DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP);
+     }
+ }
 --
@@ -4,16 +4,16 @@ Subject: Add option to not persist tabs across sessions

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../android/java/res/xml/privacy_preferences.xml |  5 +++++
- .../chrome/browser/ChromeTabbedActivity.java     |  5 ++++-
- .../privacy/settings/PrivacySettings.java        | 16 +++++++++++++++-
- .../android/strings/android_chrome_strings.grd   |  6 ++++++
- 4 files changed, 30 insertions(+), 2 deletions(-)
+ .../android/java/res/xml/privacy_preferences.xml  |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java      |  5 ++++-
+ .../browser/privacy/settings/PrivacySettings.java | 15 ++++++++++++++-
+ .../ui/android/strings/android_chrome_strings.grd |  6 ++++++
+ 4 files changed, 29 insertions(+), 2 deletions(-)

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -82,6 +82,11 @@ found in the LICENSE file.
+@@ -95,6 +95,11 @@ found in the LICENSE file.
         android:title="@string/incognito_settings_title"
         android:summary="@string/incognito_settings_summary"
         android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,17 +28,17 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -41,6 +41,7 @@ import org.chromium.base.BuildInfo;
- import org.chromium.base.Callback;
+@@ -46,6 +46,7 @@ import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
+ import org.chromium.base.CallbackUtils;
 import org.chromium.base.CommandLine;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.base.Log;
 import org.chromium.base.MemoryPressureListener;
-@@ -1614,8 +1615,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2151,8 +2152,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
             boolean hadCipherData =
-                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
+                     CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
 
 +            String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
             boolean noRestoreState =
@@ -51,33 +51,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.privacy.settings;
- import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS_MODE;
+@@ -9,6 +9,7 @@ import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS
 
- import android.os.Build;
+ import android.content.Context;
+ import android.content.Intent;
 +import android.content.SharedPreferences;
+ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
- import android.text.style.ForegroundColorSpan;
-@@ -21,6 +22,8 @@ import androidx.preference.Preference;
+@@ -22,6 +23,7 @@ import androidx.annotation.VisibleForTesting;
+ import androidx.preference.Preference;
 
+ import org.chromium.base.Callback;
+import org.chromium.base.ContextUtils;
+ import org.chromium.base.IntentUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-+import org.chromium.base.ContextUtils;
-+import org.chromium.base.BuildInfo;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -88,6 +91,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -114,6 +116,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;
-     private static final String PREF_IP_PROTECTION = "ip_protection";
-     @VisibleForTesting static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-@@ -295,7 +300,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
+     @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";
+@@ -382,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
@@ -89,8 +88,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
-         } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
-@@ -349,6 +358,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+         } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
+@@ -442,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             getContext(), getProfile()));
         }
 
@@ -105,17 +104,17 @@ 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
-@@ -4918,6 +4918,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
+@@ -2850,6 +2850,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+       <message name="IDS_ACCESSIBILITY_TAB_SWITCHER_TITLE" desc="Accessibility label of the current window when Grid Tab Switcher is shown.">
+         All tabs
       </message>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
 +        Close all open tabs on exit
 +      </message>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
-+        Don't persist tabs between browsing sessions
+        Don't persist tabs between browsing sessions. Caution: parameters in urls allow linking between different sessions.
 +      </message>
-       <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
-         LINK
+       <message name="IDS_TAB_LOADING_DEFAULT_TITLE" desc="The title of a tab when we are still waiting for either the URL or the real title. This generally shows when the page is first loading.">
+         Loading…
       </message>
 --
@@ -6,9 +6,10 @@ And allow use about:blank as default homepage

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../tab_management/TabGridDialogMediator.java    |  9 ++++++++-
+ .../tab_management/TabGridDialogMediator.java    | 11 ++++++++++-
 .../tasks/tab_management/TabGroupUiMediator.java |  8 +++++++-
 .../java/res/xml/homepage_preferences.xml        |  5 +++++
+ .../strip/TabGroupContextMenuCoordinator.java    | 11 ++++++++++-
 .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++
 .../homepage/settings/HomepageSettings.java      | 12 ++++++++++++
 .../chrome/browser/metrics/LaunchMetrics.java    |  1 -
@@ -18,60 +19,53 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../android/strings/android_chrome_strings.grd   |  3 +++
 chrome/browser/ui/browser_ui_prefs.cc            |  2 ++
 chrome/common/pref_names.h                       |  4 ++++
- 12 files changed, 67 insertions(+), 3 deletions(-)
+ 13 files changed, 79 insertions(+), 4 deletions(-)

 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
-@@ -26,6 +26,7 @@ import org.chromium.base.task.TaskTraits;
- import org.chromium.chrome.browser.data_sharing.DataSharingNotificationManager;
- import org.chromium.chrome.browser.data_sharing.SharedImageTilesCoordinator;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -120,6 +120,9 @@ import java.util.Optional;
+ import java.util.Set;
+ import java.util.function.Supplier;
+ 
 +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;
-@@ -58,6 +59,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate;
- import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.ui.text.EmptyTextWatcher;
 +import org.chromium.url.GURL;
- 
- import java.util.ArrayList;
- import java.util.List;
-@@ -697,11 +699,16 @@ public class TabGridDialogMediator
- 
-             assert relatedTabs.size() > 0;
+
+ /**
+  * A mediator for the TabGridDialog component, responsible for communicating with the components'
+  * coordinator as well as managing the business logic for dialog show/hide.
+@@ -1028,9 +1031,15 @@ public class TabGridDialogMediator
+                 return;
+             }
 
 +            String url = UrlConstants.NTP_URL;
-+            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
+            if (UrlConstants.NTP_URL.equals(url)
+                    && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
 +                url = gurl != null ? gurl.getSpec() : url;
 +            }
-             Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
-             mTabCreatorManager
-                     .getTabCreator(currentTab.isIncognito())
-                     .createNewTab(
-                            new LoadUrlParams(UrlConstants.NTP_URL),
-+                            new LoadUrlParams(url),
-                             TabLaunchType.FROM_TAB_GROUP_UI,
-                             parentTabToAttach);
+             TabGroupUtils.openUrlInGroup(
+                     assumeNonNull(mCurrentTabGroupModelFilterSupplier.get()),
+-                    UrlConstants.NTP_URL,
+                    url,
+                     tabsInGroup.get(tabsInGroup.size() - 1).getId(),
+                     TabLaunchType.FROM_TAB_GROUP_UI);
             RecordUserAction.record("MobileNewTabOpened." + mComponentName);
 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
-@@ -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;
-+import org.chromium.chrome.browser.homepage.HomepageManager;
+@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
+ import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesConfig;
+ import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
 import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -375,10 +376,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -420,10 +421,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                     assert relatedTabs.size() > 0;
 
-                     parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
+                     Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
 +                    String url = UrlConstants.NTP_URL;
 +                    if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                        GURL gurl = HomepageManager.getInstance().getHomepageGurl();
@@ -100,10 +94,40 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
     <org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
         android:key="homepage_radio_group"
         android:selectable="false"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+@@ -84,6 +84,9 @@ import org.chromium.ui.widget.RectProvider;
+ 
+ import java.util.function.Supplier;
+ 
+import org.chromium.chrome.browser.homepage.HomepageManager;
+import org.chromium.url.GURL;
+
+ /**
+  * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
+  * responsible for creating a list of menu items, setting up the menu and displaying the menu.
+@@ -228,9 +231,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+                         /* didCloseCallback= */ null);
+                 RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
+             } else if (menuId == R.id.open_new_tab_in_group) {
+                String url = UrlConstants.NTP_URL;
+                if (UrlConstants.NTP_URL.equals(url)
+                        && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
+                    GURL gurl = HomepageManager.getInstance().getHomepageGurl();
+                    url = gurl != null ? gurl.getSpec() : url;
+                }
+                 TabGroupUtils.openUrlInGroup(
+                         tabGroupModelFilter,
+-                        UrlConstants.NTP_URL,
+                        url,
+                         tabId,
+                         TabLaunchType.FROM_TAB_GROUP_UI);
+                 RecordUserAction.record("MobileToolbarTabGroupMenu.NewTabInGroup");
 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
-@@ -233,6 +233,22 @@ public class HomepageManager
+@@ -257,6 +257,22 @@ public class HomepageManager
         notifyHomepageUpdated();
     }
 
@@ -129,15 +153,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -22,6 +22,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -26,6 +26,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.url.GURL;
 +import org.chromium.components.embedder_support.util.UrlConstants;
 
 /** Fragment that allows the user to configure homepage related preferences. */
- public class HomepageSettings extends ChromeBaseSettingsFragment {
-@@ -30,6 +31,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+ @NullMarked
+@@ -35,6 +36,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
     @VisibleForTesting
     public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
 
@@ -145,9 +169,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 +
     private HomepageManager mHomepageManager;
     private RadioButtonGroupHomepagePreference mRadioButtons;
- 
-@@ -64,6 +67,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
-                 });
+     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+@@ -102,6 +105,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+         mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged);
         mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
 
 +        ChromeSwitchPreference mNTPIsHomepageSwitch =
@@ -165,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
-@@ -111,7 +111,6 @@ public class LaunchMetrics {
+@@ -117,7 +117,6 @@ public class LaunchMetrics {
     public static void recordHomePageLaunchMetrics(
             boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
         if (homepageGurl.isEmpty()) {
@@ -176,18 +200,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
+@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.new_tab_url.DseNewTabUrlManager;
+ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
- import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
- import org.chromium.chrome.browser.ntp.NewTabPageUtils;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
-@@ -485,6 +486,13 @@ public class ChromeTabCreator extends TabCreator {
-      * @return the created tab.
+ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -569,6 +570,13 @@ public class ChromeTabCreator extends TabCreator
      */
-     public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
+     public @Nullable Tab launchUrl(
+             String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
 +        if (!mIncognito && url.equals(UrlConstants.NTP_URL)) {
 +            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
@@ -201,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -277,6 +277,7 @@ public final class ChromePreferenceKeys {
+@@ -334,6 +334,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 +236,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -62,6 +62,7 @@ public class LegacyChromePreferenceKeys {
+@@ -60,6 +60,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
                 ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -223,7 +247,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1377,6 +1377,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1324,6 +1324,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,10 +260,10 @@ 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());
+@@ -115,6 +115,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+ 
+   registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
+                                 pref_registration_flags);
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
 +                                PrefRegistry::NO_REGISTRATION_FLAGS);
 
@@ -248,15 +272,15 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1280,6 +1280,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
- // toolbar.
- inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
+@@ -1345,6 +1345,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
+ // by enterprise policy.
+ inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
 
 +// A boolean specifying whether opening a new tab should open the Home page
 +// instead of the New Tab page.
 +inline constexpr char kNewTabPageIsHomePage[] = "newtabpage_is_homepage";
 +
- // Boolean pref to define the default setting for "block offensive words".
- // The old key value is kept to avoid unnecessary migration code.
- inline constexpr char kSpeechRecognitionFilterProfanities[] =
+ // Comma separated list of domain names (e.g. "google.com,school.edu").
+ // When this pref is set, the user will be able to access Google Apps
+ // only using an account that belongs to one of the domains from this pref.
 --
@@ -9,12 +9,21 @@ 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 ++
+ components/search_engines/BUILD.gn            |   3 ++
+ components/search_engines/cromite/BUILD.gn    |  12 ++++++
+ .../cromite/cromite_prepopulated_engines.json |  37 ++++++++++++++++++
+ .../search_engine_choice_utils.cc             |   5 +--
 .../search_engines/search_engine_type.h       |   5 +++
- 5 files changed, 40 insertions(+)
+ .../template_url_prepopulate_data.cc          |  21 +++++++++-
+ .../template_url_prepopulate_data.h           |   9 -----
+ tools/json_to_struct/json_to_struct.gni       |   9 +++++
+ tools/json_to_struct/json_to_struct.py        |  26 ++++++++----
+ tools/json_to_struct/struct_generator.py      |  10 +++--
+ tools/variations/fieldtrial_to_struct.py      |   4 +-
+ 12 files changed, 113 insertions(+), 28 deletions(-)
 create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
+ create mode 100644 components/search_engines/cromite/BUILD.gn
+ create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json

 diff --git a/components/resources/default_100_percent/search_engine_choice/default_favicon.png b/components/resources/default_100_percent/search_engine_choice/default_favicon.png
 new file mode 100644
@@ -43,96 +52,120 @@ 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
-@@ -113,6 +113,16 @@
-       "id": 92
-     },
+diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
+--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
+@@ -72,6 +72,7 @@ static_library("search_engines") {
+     "//third_party/metrics_proto",
+     "//third_party/omnibox_proto",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+   ]
 
-+    "duckduckgo_light": {
-+      "name": "DuckDuckGo Light",
-+      "keyword": "duckduckgo.com/lite",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
-+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
-+      "id": 12
-+    },
+   deps = [
+@@ -162,6 +163,7 @@ source_set("search_engine_utils") {
+     ":search_engine_type",
+     "//components/google/core/common",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+   ]
+ 
+   deps = [ "//url" ]
+@@ -252,6 +254,7 @@ source_set("unit_tests") {
+     "//testing/gmock",
+     "//testing/gtest",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+     "//ui/base",
+     "//url",
+   ]
+diff --git a/components/search_engines/cromite/BUILD.gn b/components/search_engines/cromite/BUILD.gn
+new file mode 100644
+--- /dev/null
+++ b/components/search_engines/cromite/BUILD.gn
+@@ -0,0 +1,12 @@
+import("//tools/json_to_struct/json_to_struct.gni")
 +
-     "ecosia": {
-       "name": "Ecosia",
-       "keyword": "ecosia.org",
-@@ -174,6 +184,27 @@
-       "id": 111
-     },
- 
-+    "googleen": {
-+      "name": "Google in English",
-+      "keyword": "googleen",
-+      "favicon_url": "https://www.google.com/favicon.ico",
-+      "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en",
-+      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en",
-+      "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
-+      "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
-+      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
-+      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
-+      "alternate_urls": [
-+        "{google:baseURL}?hl=en#q={searchTerms}",
-+        "{google:baseURL}search?hl=en#q={searchTerms}",
-+        "{google:baseURL}webhp?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en&q={searchTerms}"
-+      ],
-+      "type": "SEARCH_ENGINE_GOOGLE_EN",
-+      "id": 13
-+    },
+json_to_struct("cromite_prepopulated_engines") {
+  visibility = [ "//components/search_engines:*" ]
 +
-     "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;
+  source = "cromite_prepopulated_engines.json"
+  schema_file = "//third_party/search_engines_data/prepopulated_engines_schema.json"
+  namespace = "TemplateURLPrepopulateData"
+  excludetype = true
+
+  deps = [ "//base" ]
+}
+diff --git a/components/search_engines/cromite/cromite_prepopulated_engines.json b/components/search_engines/cromite/cromite_prepopulated_engines.json
+new file mode 100644
+--- /dev/null
+++ b/components/search_engines/cromite/cromite_prepopulated_engines.json
+@@ -0,0 +1,37 @@
+{
+    "additionals_includes": {
+        "third_party/search_engines_data/resources/definitions/prepopulated_engines.h": ""
+    },
+    "elements": {
+        "duckduckgo_light": {
+            "name": "DuckDuckGo Light",
+            "keyword": "duckduckgo.com/lite",
+            "favicon_url": "https://duckduckgo.com/favicon.ico",
+            "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
+            "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
+            "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
+            "id": 12
+        },
+
+        "googleen": {
+            "name": "Google in English",
+            "keyword": "googleen",
+            "favicon_url": "https://www.google.com/favicon.ico",
+            "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en",
+            "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en",
+            "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
+            "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
+            "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
+            "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
+            "alternate_urls": [
+              "{google:baseURL}?hl=en#q={searchTerms}",
+              "{google:baseURL}search?hl=en#q={searchTerms}",
+              "{google:baseURL}webhp?hl=en#q={searchTerms}",
+              "{google:baseURL}s?hl=en#q={searchTerms}",
+              "{google:baseURL}s?hl=en&q={searchTerms}"
+            ],
+            "type": "SEARCH_ENGINE_GOOGLE_EN",
+            "id": 13
+        }
+    }
+}
+diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
+--- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
+++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
+@@ -172,10 +172,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
 }
+ 
+ void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
+-  base::UmaHistogramExactLinear(
+-      kSearchEngineChoiceScreenSelectedEngineIndexHistogram,
+-      selected_engine_index,
+-      TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
+  // do nothing in Cromite
+ }
+ 
+ void RecordChoiceScreenPositionsCountryMismatch(bool has_mismatch) {
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -91,10 +91,15 @@ enum SearchEngineType {
-   SEARCH_ENGINE_YOU = 72,
-   SEARCH_ENGINE_STARTER_PACK_ASK_GOOGLE = 73,
-   SEARCH_ENGINE_LILO = 74,
-+  SEARCH_ENGINE_GOOGLE_EN = 75,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
+@@ -98,11 +98,16 @@ enum SearchEngineType {
+   SEARCH_ENGINE_FREESPOKE = 78,
+   SEARCH_ENGINE_KAGI = 79,
+   SEARCH_ENGINE_STARTER_PACK_AI_MODE = 80,
+  SEARCH_ENGINE_GOOGLE_EN = 81,
+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 82,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };
+ // LINT.ThenChange(//tools/metrics/histograms/enums.xml:OmniboxSearchEngineType)
 
 +static_assert(SEARCH_ENGINE_DUCKDUCKGOLIGHT == (SEARCH_ENGINE_MAX - 1),
 +              "Please check this patch");
@@ -140,4 +173,246 @@ 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
+@@ -28,6 +28,8 @@
+ #include "components/search_engines/template_url_data_util.h"
+ #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h"
+ 
+#include "components/search_engines/cromite/cromite_prepopulated_engines.h"
+
+ namespace TemplateURLPrepopulateData {
+ 
+ // Helpers --------------------------------------------------------------------
+@@ -122,7 +124,7 @@ int GetDataVersion(PrefService* prefs) {
+       kCurrentDataVersion;
+ }
+ 
+-std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEnginesChromium(
+     PrefService& prefs,
+     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+         regional_prepopulated_engines) {
+@@ -138,6 +140,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+                         &PrepopulatedEngineToTemplateURLData);
+ }
+ 
+std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+    PrefService& prefs,
+    std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+        regional_prepopulated_engines) {
+  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
+    GetPrepopulatedEnginesChromium(prefs, regional_prepopulated_engines);
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));
+  return t_urls;
+}
+
+ std::unique_ptr<TemplateURLData> GetPrepopulatedEngine(
+     PrefService& prefs,
+     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+@@ -159,10 +172,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+     return std::vector<std::unique_ptr<TemplateURLData>>();
+   }
+ 
+-  return base::ToVector(regional_capabilities::GetPrepopulatedEngines(
+  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
+    base::ToVector(regional_capabilities::GetPrepopulatedEngines(
+                             country_id, prefs,
+                             regional_capabilities::SearchEngineListType::kTopN),
+                         &PrepopulatedEngineToTemplateURLData);
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));
+  return t_urls;
+ }
+ 
+ #endif
+diff --git a/components/search_engines/template_url_prepopulate_data.h b/components/search_engines/template_url_prepopulate_data.h
+--- a/components/search_engines/template_url_prepopulate_data.h
+++ b/components/search_engines/template_url_prepopulate_data.h
+@@ -27,15 +27,6 @@ struct PrepopulatedEngine;
+ 
+ extern const int kMaxPrepopulatedEngineID;
+ 
+-// The maximum number of prepopulated search engines that can be returned in
+-// any of the EEA countries by `GetPrepopulatedEngines()`.
+-//
+-// Note: If this is increased, please also increase the declared variant count
+-// for the `Search.ChoiceScreenShowedEngineAt.Index{Index}` histogram.
+-// TODO(crbug.com/408932087): Investigate moving it to the file that actually
+-// populates these, `//c/regional_capabilities/r*c*_util.cc`.
+-inline constexpr size_t kMaxEeaPrepopulatedEngines = 8;
+-
+ // The maximum number of prepopulated search engines that can be returned in
+ // in the rest of the world by `GetPrepopulatedEngines()`.
+ // TODO(crbug.com/408932087): Investigate deduping it with the constant
+diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json_to_struct.gni
+--- a/tools/json_to_struct/json_to_struct.gni
+++ b/tools/json_to_struct/json_to_struct.gni
+@@ -39,6 +39,11 @@ template("json_to_struct") {
+   action_name = target_name + "_action"
+   source_set_name = target_name
+ 
+  excludetype = false
+  if (defined(invoker.excludetype)) {
+    excludetype = invoker.excludetype
+  }
+
+   action(action_name) {
+     visibility = [ ":$source_set_name" ]
+     script = "//build/gn_run_binary.py"
+@@ -63,6 +68,10 @@ template("json_to_struct") {
+       "--namespace=" + invoker.namespace,
+       "--schema=" + rebase_path(invoker.schema_file, root_build_dir),
+     ]
+
+    if (excludetype) {
+      args += [ "--excludetype=yes" ]
+    }
+   }
+ 
+   source_set(source_set_name) {
+diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_to_struct.py
+--- a/tools/json_to_struct/json_to_struct.py
+++ b/tools/json_to_struct/json_to_struct.py
+@@ -103,7 +103,7 @@ def _GenerateHeaderGuard(h_filename):
+   return re.sub(u'^_*', '', result) + u'_'  # Remove leading underscores.
+ 
+ 
+-def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+def _GenerateH(basepath, fileroot, head, namespace, schema, description, excludetype):
+   """Generates the .h file containing the definition of the structure specified
+   by the schema.
+ 
+@@ -147,11 +147,15 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+       f.write(u'#include "%s"\n' % header)
+     f.write(u'\n')
+ 
+    for header in description.get(u'additionals_includes', []):
+      f.write(u'#include "%s"\n' % header)
+    f.write(u'\n')
+
+     if namespace:
+       f.write(u'namespace %s {\n' % namespace)
+       f.write(u'\n')
+ 
+-    f.write(struct_generator.GenerateStruct(
+    f.write(struct_generator.GenerateStruct(excludetype,
+       schema['type_name'], schema['schema']))
+     f.write(u'\n')
+ 
+@@ -176,7 +180,7 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+     f.write(u'#endif  // %s\n' % header_guard)
+ 
+ 
+-def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+def _GenerateCC(basepath, fileroot, head, namespace, schema, description, excludetype):
+   """Generates the .cc file containing the static initializers for the
+   of the elements specified in the description.
+ 
+@@ -211,7 +215,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+     f.write(element_generator.GenerateElements(schema['type_name'],
+         schema['schema'], description))
+ 
+-    if not aggregation.export_items:
+    if excludetype == False and not aggregation.export_items:
+       f.write('\n}  // anonymous namespace \n\n')
+ 
+     aggregated = GenerateCCAggregation(schema['type_name'], aggregation)
+@@ -298,7 +302,7 @@ def GenerateClass(basepath,
+ 
+ 
+ def GenerateStruct(basepath, output_root, namespace, schema, description,
+-                   description_filename, schema_filename, year=None):
+                   description_filename, schema_filename, excludetype, year):
+   """Generates a C++ struct from a JSON description.
+ 
+   Args:
+@@ -317,8 +321,8 @@ def GenerateStruct(basepath, output_root, namespace, schema, description,
+   """
+   year = int(year) if year else datetime.now().year
+   head = HEAD % (year, schema_filename, description_filename)
+-  _GenerateH(basepath, output_root, head, namespace, schema, description)
+-  _GenerateCC(basepath, output_root, head, namespace, schema, description)
+  _GenerateH(basepath, output_root, head, namespace, schema, description, excludetype)
+  _GenerateCC(basepath, output_root, head, namespace, schema, description, excludetype)
+ 
+ if __name__ == '__main__':
+   parser = optparse.OptionParser(
+@@ -333,11 +337,17 @@ if __name__ == '__main__':
+   parser.add_option('-s', '--schema', help='path to the schema file, '
+       'mandatory.')
+   parser.add_option('-o', '--output', help='output filename, ')
+  parser.add_option('-x', '--excludetype', help='exclude type generator, ')
+   (opts, args) = parser.parse_args()
+ 
+   if not opts.schema:
+     parser.error('You must specify a --schema.')
+ 
+  if not opts.excludetype:
+    opts.excludetype = False
+  else:
+    opts.excludetype = True
+
+   description_filename = os.path.normpath(args[0])
+   root, ext = os.path.splitext(description_filename)
+   shortroot = opts.output if opts.output else os.path.split(root)[1]
+@@ -354,4 +364,4 @@ if __name__ == '__main__':
+   schema = _Load(opts.schema)
+   description = _Load(description_filename)
+   GenerateStruct(basepath, output_root, opts.namespace, schema, description,
+-                 description_filename, opts.schema)
+                 description_filename, opts.schema, opts.excludetype, datetime.now().year)
+diff --git a/tools/json_to_struct/struct_generator.py b/tools/json_to_struct/struct_generator.py
+--- a/tools/json_to_struct/struct_generator.py
+++ b/tools/json_to_struct/struct_generator.py
+@@ -30,20 +30,24 @@ def GenerateField(field_info):
+   else:
+     raise RuntimeError('Unknown field type "%s"' % type)
+ 
+-def GenerateStruct(type_name, schema):
+def GenerateStruct(excludetype, type_name, schema):
+   """Generate a string defining a structure containing the fields specified in
+   the schema list.
+   """
+   lines = []
+  if excludetype:
+    lines.append('struct %s;' % type_name)
+    return '\n'.join(lines) + '\n'
+
+   lines.append('struct %s {' % type_name)
+   for field_info in schema:
+     if field_info['type'] == 'struct':
+-      lines.insert(0, GenerateStruct(field_info['type_name'],
+      lines.insert(0, GenerateStruct(excludetype, field_info['type_name'],
+                                      field_info['fields']))
+     elif (field_info['type'] == 'array'
+           and field_info['contents']['type'] == 'struct'):
+       contents = field_info['contents']
+-      lines.insert(0, GenerateStruct(contents['type_name'],
+      lines.insert(0, GenerateStruct(excludetype, contents['type_name'],
+                                      contents['fields']))
+     lines.append('  ' + GenerateField(field_info) + ';')
+   lines.append('};')
+diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py
+--- a/tools/variations/fieldtrial_to_struct.py
+++ b/tools/variations/fieldtrial_to_struct.py
+@@ -235,14 +235,14 @@ def main(arguments):
+   json_to_struct.GenerateStruct(
+       basepath, output_root, opts.namespace, schema, description,
+       os.path.split(description_filename)[1], os.path.split(opts.schema)[1],
+-      opts.year)
+      False, opts.year)
+ 
+   # TODO(peilinwang) filter the schema by platform, form_factor, etc.
+   if opts.java:
+     json_to_struct.GenerateClass(basepath, output_root, opts.namespace, schema,
+                                  description,
+                                  os.path.split(description_filename)[1],
+-                                 os.path.split(opts.schema)[1], opts.year)
+                                 os.path.split(opts.schema)[1], False, opts.year)
+ 
+ 
+ if __name__ == '__main__':
 --
@@ -5,15 +5,17 @@ Subject: Add setting to clear data on exit
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/android/chrome_java_sources.gni        |  1 +
+ .../java/res/xml/privacy_preferences.xml      |  5 ++
 .../chrome/browser/ChromeTabbedActivity.java  |  7 +-
- .../ClearBrowsingDataFragment.java            |  6 ++
- .../ClearBrowsingDataFragmentAtStart.java     | 74 +++++++++++++++++++
- .../ClearBrowsingDataTabsFragment.java        |  7 +-
+ .../browsing_data/BrowsingDataBridge.java     | 12 +--
+ .../ClearBrowsingDataFragment.java            | 31 ++++++--
+ .../ClearBrowsingDataFragmentAtStart.java     | 79 +++++++++++++++++++
 chrome/app/settings_strings.grdp              | 10 +++
- .../browsing_data/browsing_data_bridge.cc     |  2 +-
+ chrome/browser/about_flags.cc                 |  1 +
+ .../browsing_data/browsing_data_bridge.cc     | 17 +++-
 .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
- .../chrome_browsing_data_remover_delegate.cc  | 13 ++++
- .../api/settings_private/prefs_util.cc        | 17 +++++
+ .../chrome_browsing_data_remover_delegate.cc  | 15 ++++
+ .../api/settings_private/prefs_util.cc        | 17 ++++
 .../browser/profiles/ProfileManagerUtils.java |  5 ++
 .../profiles/android/profile_manager_utils.cc |  5 ++
 chrome/browser/profiles/profile_manager.cc    | 15 +++-
@@ -21,46 +23,71 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../clear_browsing_data_dialog.html           | 44 +++++++++++
 .../clear_browsing_data_dialog.ts             |  2 +
 .../strings/android_chrome_strings.grd        |  3 +
+ .../Add-setting-to-clear-data-on-exit.grdp    |  9 +++
 .../settings_localized_strings_provider.cc    |  1 +
+ .../content/browsing_data_helper.cc           |  9 ++-
+ components/browsing_data/core/BUILD.gn        |  5 ++
 .../core/browsing_data_policies_utils.cc      | 20 ++---
 .../core/browsing_data_policies_utils.h       | 11 +++
 .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
- .../core/clear_browsing_data_tab.h            |  2 +-
- components/browsing_data/core/pref_names.cc   | 17 +++++
+ .../core/clear_browsing_data_tab.h            |  3 +-
+ components/browsing_data/core/pref_names.cc   | 17 ++++
 components/browsing_data/core/pref_names.h    | 10 +++
+ components/favicon/core/favicon_database.cc   |  9 +++
+ components/favicon/core/favicon_database.h    |  2 +
 .../search_engines/template_url_service.cc    |  1 +
+ content/browser/btm/btm_service_impl.cc       |  2 +-
 content/browser/storage_partition_impl.cc     |  1 +
- 26 files changed, 312 insertions(+), 17 deletions(-)
+ .../public/browser/browsing_data_remover.h    |  7 +-
+ .../Add-setting-to-clear-data-on-exit.inc     |  8 ++
+ 36 files changed, 406 insertions(+), 33 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc

 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
-@@ -308,6 +308,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",
+@@ -264,6 +264,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
 +  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ConfirmImportantSitesDialogFragment.java",
   "java/src/org/chromium/chrome/browser/browsing_data/OtherFormsOfHistoryDialogFragment.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilter.java",
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -19,6 +19,11 @@ found in the LICENSE file.
+         android:title="@string/clear_browsing_data_title"
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
+    <Preference
+        android:key="clear_browsing_data_advanced"
+        android:title="@string/clear_browsing_data_at_start_title"
+        android:summary="@string/clear_browsing_data_at_start_summary"
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAtStart" />
+     <Preference
+         android:key="privacy_guide"
+         app:isPreferenceVisible="false"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -172,6 +172,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -203,6 +203,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
 +import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
 import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
+ import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
 import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
- import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification;
-@@ -1614,7 +1615,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2157,7 +2158,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
             Intent intent = getIntent();
 
             boolean hadCipherData =
-                    CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
-+                    CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); //
+-                    CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
+                    CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState()); //
 +            if (!hadCipherData) {
 +                Log.i(TAG, "Removing browsing data");
 +                ProfileManagerUtils.removeBrowsingDataAtStart();
@@ -68,12 +95,103 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 
             String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
             boolean noRestoreState =
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+@@ -224,8 +224,8 @@ public final class BrowsingDataBridge implements Destroyable {
+      *     BrowsingDataType}).
+      * @return The state of the corresponding deletion preference.
+      */
+-    public boolean getBrowsingDataDeletionPreference(int dataType) {
+-        return BrowsingDataBridgeJni.get().getBrowsingDataDeletionPreference(mProfile, dataType);
+    public boolean getBrowsingDataDeletionPreference(int dataType, int clearBrowsingDataTab) {
+        return BrowsingDataBridgeJni.get().getBrowsingDataDeletionPreference(mProfile, dataType, clearBrowsingDataTab);
+     }
+ 
+     /**
+@@ -235,8 +235,8 @@ public final class BrowsingDataBridge implements Destroyable {
+      *     BrowsingDataType}).
+      * @param value The state to be set.
+      */
+-    public void setBrowsingDataDeletionPreference(int dataType, boolean value) {
+-        BrowsingDataBridgeJni.get().setBrowsingDataDeletionPreference(mProfile, dataType, value);
+    public void setBrowsingDataDeletionPreference(int dataType, int clearBrowsingDataTab, boolean value) {
+        BrowsingDataBridgeJni.get().setBrowsingDataDeletionPreference(mProfile, dataType, clearBrowsingDataTab, value);
+     }
+ 
+     /**
+@@ -340,10 +340,10 @@ public final class BrowsingDataBridge implements Destroyable {
+                 @JniType("Profile*") Profile profile, @JniType("std::string") String origin);
+ 
+         boolean getBrowsingDataDeletionPreference(
+-                @JniType("Profile*") Profile profile, int dataType);
+                @JniType("Profile*") Profile profile, int dataType, int clearBrowsingDataTab);
+ 
+         void setBrowsingDataDeletionPreference(
+-                @JniType("Profile*") Profile profile, int dataType, boolean value);
+                @JniType("Profile*") Profile profile, int dataType, int clearBrowsingDataTab, boolean value);
+ 
+         int getBrowsingDataDeletionTimePeriod(@JniType("Profile*") Profile profile);
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -448,6 +448,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
-     /** Returns whether is a basic or advanced Clear Browsing Data tab. */
-     protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
+@@ -160,6 +160,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+             assert mCheckbox == preference;
+ 
+             mParent.updateButtonState();
+
+            BrowsingDataBridge.getForProfile(mParent.getProfile())
+                    .setBrowsingDataDeletionPreference(
+                            ClearBrowsingDataFragment.getDataType(mOption),
+                            mParent.getClearBrowsingDataTabType(),
+                            mCheckbox.isChecked());
+             return true;
+         }
+ 
+@@ -241,7 +247,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+     private @TimePeriod int mLastSelectedTimePeriod;
+     private boolean mShouldShowPostDeleteFeedback;
+ 
+-    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+    protected final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+ 
+     /**
+      * @return All available {@link DialogOption} entries.
+@@ -347,7 +353,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+     }
+ 
+     /** Called when browsing data is about to be cleared. */
+-    private void onClearBrowsingData() {
+    protected void onClearBrowsingData() {
+         RecordUserAction.record("ClearBrowsingData_AdvancedTab");
+ 
+         if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
+@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+             BrowsingDataBridge.getForProfile(getProfile())
+                     .setBrowsingDataDeletionPreference(
+                             ClearBrowsingDataFragment.getDataType(item.getOption()),
+                            getClearBrowsingDataTabType(),
+                             item.isSelected());
+         }
+ 
+@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                 .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
+     }
+ 
+    protected int getClearBrowsingDataTabType() {
+        return ClearBrowsingDataTab.ADVANCED;
+    }
+
+     /** Returns the list of supported {@link DialogOption}. */
+-    private List<Integer> getDialogOptions(Bundle fragmentArgs) {
+    protected List<Integer> getDialogOptions(Bundle fragmentArgs) {
+         String referrer =
+                 fragmentArgs.getString(
+                         ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
+@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                 DialogOption.CLEAR_SITE_SETTINGS);
+     }
 
 +    protected boolean shouldClearBrowsingData() {
 +        return true;
@@ -82,7 +200,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     /**
      * Decides whether a given dialog option should be selected when the dialog is initialized.
      *
-@@ -528,6 +532,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+      */
+     private boolean isOptionSelectedByDefault(@DialogOption int option) {
+         return BrowsingDataBridge.getForProfile(getProfile())
+-                .getBrowsingDataDeletionPreference(getDataType(option));
+                .getBrowsingDataDeletionPreference(getDataType(option), getClearBrowsingDataTabType());
+     }
+ 
+     /**
+@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      * options.
      */
     private void onClearButtonClicked() {
@@ -90,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         if (shouldShowImportantSitesDialog()) {
             showImportantDialogThenClear();
             return;
-@@ -560,6 +565,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
         Button clearButton = (Button) getView().findViewById(R.id.clear_button);
         boolean isEnabled = !getSelectedOptions().isEmpty();
         clearButton.setEnabled(isEnabled);
@@ -98,11 +225,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     }
 
     private int getSpinnerIndex(
+@@ -651,7 +668,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                             .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
+                 enabled = false;
+                 browsingDataBridge.setBrowsingDataDeletionPreference(
+-                        getDataType(DialogOption.CLEAR_HISTORY), false);
+                        getDataType(DialogOption.CLEAR_HISTORY), getClearBrowsingDataTabType(), false);
+             }
+ 
+             // Disable tabs closure if the user is in multi-window mode.
+@@ -681,8 +698,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+         mSigninManager.addSignInStateObserver(this);
+ 
+         setHasOptionsMenu(true);
+
+        onCustomizePreferences(savedInstanceState, rootKey);
+     }
+ 
+    protected void onCustomizePreferences(Bundle savedInstanceState, String rootKey) {}
+
+     @Override
+     public ObservableSupplier<String> getPageTitle() {
+         return mPageTitle;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,79 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -157,19 +306,24 @@ new file mode 100644
 +    }
 +
 +    @Override
+    protected void onCustomizePreferences(Bundle savedInstanceState, String rootKey) {
+        mPageTitle.set(getString(R.string.clear_browsing_data_at_start_title));
+    }
+
+    @Override
 +    protected int getClearBrowsingDataTabType() {
 +        return ClearBrowsingDataTab.AT_START;
 +    }
 +
 +    @Override
-+    protected List<Integer> getDialogOptions() {
+    protected List<Integer> getDialogOptions(Bundle fragmentArgs) {
 +        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);
 +    }
 +
 +    @Override
-+    protected void onClearBrowsingData() {
+    public void onClearBrowsingData() {
 +    }
 +
 +    @Override
@@ -177,43 +331,12 @@ new file mode 100644
 +        return false;
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-@@ -29,7 +29,7 @@ import org.chromium.chrome.browser.settings.SettingsActivity;
-  * Fragment with a {@link TabLayout} containing a basic and an advanced version of the CBD dialog.
-  */
- public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDependentSetting {
-    public static final int CBD_TAB_COUNT = 2;
-+    public static final int CBD_TAB_COUNT = 3;
- 
-     private Profile mProfile;
-     private ClearBrowsingDataFetcher mFetcher;
-@@ -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);
-+            case 2:
-+                return getActivity().getString(R.string.clear_browsing_data_atstart_tab_title);
-             default:
-                 throw new RuntimeException("invalid position: " + position);
-         }
-@@ -136,6 +138,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
-                 case 1:
-                     fragment = new ClearBrowsingDataFragmentAdvanced();
-                     break;
-+                case 2:
-+                    fragment = new ClearBrowsingDataFragmentAtStart();
-+                    break;
-                 default:
-                     throw new RuntimeException("invalid position: " + position);
-             }
 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
-@@ -2294,6 +2294,16 @@
-   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for clear browsing data button in Privacy options">
-     Clear browsing data
+@@ -2036,6 +2036,16 @@
+   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
+     Delete browsing data
   </message>
 +  <if expr="is_win or is_linux">
 +    <message name="IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE" desc="The title of the tab showing the at start clear browsing data options.">
@@ -225,25 +348,79 @@ 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 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 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>
+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
+@@ -108,6 +108,7 @@
+ #include "components/enterprise/data_controls/core/browser/features.h"
+ #include "components/enterprise/obfuscation/core/utils.h"
+ #include "components/error_page/common/error_page_switches.h"
+#include "components/favicon/core/favicon_database.h"
+ #include "components/feature_engagement/public/feature_constants.h"
+ #include "components/feature_engagement/public/feature_list.h"
+ #include "components/feed/feed_feature_list.h"
 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
-@@ -339,7 +339,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
-     const JavaParamRef<jobject>& jprofile,
-     jint tab_index) {
-   DCHECK_GE(tab_index, 0);
-  DCHECK_LT(tab_index, 2);
-+  DCHECK_LT(tab_index, 3);
-   GetPrefService(jprofile)->SetInteger(
-       browsing_data::prefs::kLastClearBrowsingDataTab, tab_index);
+@@ -70,6 +70,15 @@ PrefService* GetPrefService(Profile* profile) {
+   return profile->GetOriginalProfile()->GetPrefs();
 }
+ 
+browsing_data::ClearBrowsingDataTab ToTabEnum(jint clear_browsing_data_tab) {
+  DCHECK_GE(clear_browsing_data_tab, 0);
+  DCHECK_LE(clear_browsing_data_tab,
+            static_cast<int>(browsing_data::ClearBrowsingDataTab::MAX_VALUE));
+
+  return static_cast<browsing_data::ClearBrowsingDataTab>(
+      clear_browsing_data_tab);
+}
+
+ void OnBrowsingDataModelBuilt(JNIEnv* env,
+                               const ScopedJavaGlobalRef<jobject>& java_callback,
+                               std::unique_ptr<BrowsingDataModel> model) {
+@@ -222,7 +231,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
+ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+     JNIEnv* env,
+     Profile* profile,
+-    jint data_type) {
+    jint data_type,
+    jint clear_browsing_data_tab) {
+   DCHECK_GE(data_type, 0);
+   DCHECK_LE(data_type,
+             static_cast<int>(browsing_data::BrowsingDataType::MAX_VALUE));
+@@ -234,7 +244,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+   std::string pref;
+   if (!browsing_data::GetDeletionPreferenceFromDataType(
+           static_cast<browsing_data::BrowsingDataType>(data_type),
+-          browsing_data::ClearBrowsingDataTab::ADVANCED, &pref)) {
+          ToTabEnum(clear_browsing_data_tab), &pref)) {
+     return false;
+   }
+ 
+@@ -245,6 +255,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+     JNIEnv* env,
+     Profile* profile,
+     jint data_type,
+    jint clear_browsing_data_tab,
+     jboolean value) {
+   DCHECK_GE(data_type, 0);
+   DCHECK_LE(data_type,
+@@ -253,7 +264,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+   std::string pref;
+   if (!browsing_data::GetDeletionPreferenceFromDataType(
+           static_cast<browsing_data::BrowsingDataType>(data_type),
+-          browsing_data::ClearBrowsingDataTab::ADVANCED, &pref)) {
+          ToTabEnum(clear_browsing_data_tab), &pref)) {
+     return;
+   }
+ 
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -312,8 +312,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -324,8 +324,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
 
 void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
     bool keep_browser_alive) {
@@ -271,7 +448,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 
   if (!data_types.empty() &&
       IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -422,6 +439,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -434,6 +451,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
 bool ChromeBrowsingDataLifetimeManager::
     IsConditionSatisfiedForBrowsingDataRemoval(
         const syncer::UserSelectableTypeSet sync_types) {
@@ -282,7 +459,15 @@ 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
-@@ -440,6 +440,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -350,6 +350,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+     uint64_t origin_type_mask,
+     base::OnceCallback<void(uint64_t)> callback) {
+   CHECK(((remove_mask &
+          ~content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE &
+           ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
+           ~constants::FILTERABLE_DATA_TYPES) == 0) ||
+         filter_builder->MatchesAllOriginsAndDomains());
+@@ -453,6 +454,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           CreateTaskCompletionClosure(TracingDataType::kHistory),
           &history_task_tracker_);
     }
@@ -292,27 +477,19 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     if (ClipboardRecentContent::GetInstance())
       ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
 
-@@ -490,7 +493,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
-           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_CONTENTS |
-           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_HISTORY);
-     }
-+  }
- 
-+  if ((remove_mask & constants::DATA_TYPE_HISTORY) && may_delete_history) {
-     // 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.
-@@ -511,7 +516,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
-       if (data_manager)
-         data_manager->Refresh();
-     }
-+  }
- 
-+  if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_CACHE) {
-     base::ThreadPool::PostTaskAndReply(
-         FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
-         base::BindOnce(
-@@ -586,9 +593,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -561,6 +565,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+     // and SSL host state are scoped to hosts and represent them as std::string.
+     // Rename the method to indicate its more general usage.
+     if (profile_->GetSSLHostStateDelegate()) {
+      bool skip = false;
+      if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE) {
+        skip = true;
+      }
+      if (!skip)
+       profile_->GetSSLHostStateDelegate()->Clear(
+           filter_builder->MatchesAllOriginsAndDomains()
+               ? base::RepeatingCallback<bool(const std::string&)>()
+@@ -589,9 +598,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     }
 
     device_event_log::Clear(delete_begin_, delete_end_);
@@ -326,7 +503,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
         delete_begin_, delete_end_);
 
-@@ -1245,6 +1256,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1306,6 +1319,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
 
     if (should_clear_zero_suggest_and_session_token && template_url_service)
       template_url_service->ClearSessionToken();
@@ -338,7 +515,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -520,6 +520,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -554,6 +554,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
   (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
       settings_api::PrefType::kNumber;
 
@@ -365,7 +542,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
 diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 --- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 +++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
-@@ -52,10 +52,15 @@ public class ProfileManagerUtils {
+@@ -56,11 +56,16 @@ public class ProfileManagerUtils {
         }
     }
 
@@ -373,8 +550,9 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
 +        ProfileManagerUtilsJni.get().removeBrowsingDataAtStart();
 +    }
 +
+     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     @NativeMethods
-     interface Natives {
+     public interface Natives {
         void flushPersistentDataForAllProfiles();
 
         void removeSessionCookiesForAllProfiles();
@@ -384,7 +562,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
-@@ -62,3 +62,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
+@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
       g_browser_process->profile_manager()->GetLoadedProfiles(),
       RemoveSessionCookiesForProfile);
 }
@@ -396,12 +574,12 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1481,6 +1481,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1434,6 +1434,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
   }
 }
 
 +void ProfileManager::RemoveBrowsingDataAtStart() {
-+  base::ranges::for_each(
+  std::ranges::for_each(
 +      GetLoadedProfiles(),
 +      [](Profile* profile) {
 +        auto* browsing_data_lifetime_manager =
@@ -416,7 +594,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 void ProfileManager::DoFinalInitForServices(Profile* profile,
                                             bool go_off_the_record) {
   if (!do_final_services_init_ ||
-@@ -2141,7 +2154,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2095,7 +2108,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()) {
@@ -428,7 +606,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -199,6 +199,8 @@ class ProfileManager : public Profile::Delegate {
+@@ -215,6 +215,8 @@ class ProfileManager : public Profile::Delegate {
   //   profiles.
   std::vector<Profile*> GetLoadedProfiles() const;
 
@@ -440,7 +618,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
-@@ -317,6 +317,50 @@
+@@ -297,6 +297,50 @@
                 disabled="[[clearingInProgress_]]" no-set-pref>
             </settings-checkbox>
           </div>
@@ -488,13 +666,13 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 +                sub-label="[[counters_.hosted_apps_data]]">
 +            </settings-checkbox>
 +          </div>
-         </iron-pages>
+         </cr-page-selector>
       </div>
       <div slot="button-container">
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -304,6 +304,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -214,6 +214,7 @@ export class SettingsClearBrowsingDataDialogElement extends
         value: () =>
             [loadTimeData.getString('basicPageTitle'),
              loadTimeData.getString('advancedPageTitle'),
@@ -502,7 +680,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
     ],
       },
 
-@@ -427,6 +428,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -336,6 +337,7 @@ export class SettingsClearBrowsingDataDialogElement extends
     }
     this.clearButtonDisabled_ =
         this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -513,9 +691,9 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1472,6 +1472,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1419,6 +1419,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 web history might not show up here. If needed, tap 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>.
+         Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
       </message>
 +      <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
@@ -523,10 +701,24 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       <message name="IDS_ANDROID_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
         Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
       </message>
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_CLEAR_BROWSING_DATA_AT_START_TITLE" desc="Title of the Delete Browsing Data screen at start.">
+        Clear the data at opening
+    </message>
+    <message name="IDS_CLEAR_BROWSING_DATA_AT_START_SUMMARY" desc="Summary of the settings item that opens the Delete Browsing Data dialog.">
+        Choose what to delete when the browser opens
+    </message>
+</grit-part>
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1689,6 +1689,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -2028,6 +2028,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
       {"clearedData", IDS_SETTINGS_CLEARED_DATA},
       {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
       {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -534,10 +726,51 @@ 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
+@@ -42,8 +42,13 @@ bool WebsiteSettingsFilterAdapter(
+   // this filter is used for is DURABLE_STORAGE, which also only uses
+   // origin-scoped patterns. Such patterns can be directly translated to a GURL.
+   GURL url(primary_pattern.ToString());
+-  DCHECK(url.is_valid()) << "url: '" << url.possibly_invalid_spec() << "' "
+-                         << "pattern: '" << primary_pattern.ToString() << "'";
+  if (!url.is_valid()) {
+    // COOKIE_CONTROLS_METADATA are in the form
+    //   'https://[%2A.]domain.ext'
+    LOG(INFO) << "url: '" << url.possibly_invalid_spec() << "' "
+              << "pattern: '" << primary_pattern.ToString() << "'";
+    return true;
+  }
+   return predicate.Run(url);
+ }
+ 
+diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn
+--- a/components/browsing_data/core/BUILD.gn
+++ b/components/browsing_data/core/BUILD.gn
+@@ -62,6 +62,10 @@ if (is_android) {
+     visibility = [ ":*" ]
+     sources = [ "browsing_data_utils.h" ]
+   }
+  java_cpp_enum("clear_browsing_data_tab_javagen") {
+    visibility = [ ":*" ]
+    sources = [ "clear_browsing_data_tab.h" ]
+  }
+   java_cpp_enum("cookie_or_cache_deletion_choice_javagen") {
+     # External code should depend on ":java" instead.
+     visibility = [ ":*" ]
+@@ -71,6 +75,7 @@ if (is_android) {
+   android_library("java") {
+     srcjar_deps = [
+       ":browsing_data_utils_javagen",
+      ":clear_browsing_data_tab_javagen",
+       ":cookie_or_cache_deletion_choice_javagen",
+     ]
+     deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
 diff --git a/components/browsing_data/core/browsing_data_policies_utils.cc b/components/browsing_data/core/browsing_data_policies_utils.cc
 --- a/components/browsing_data/core/browsing_data_policies_utils.cc
 +++ b/components/browsing_data/core/browsing_data_policies_utils.cc
-@@ -16,21 +16,21 @@
+@@ -17,21 +17,21 @@
 
 namespace browsing_data {
 
@@ -593,7 +826,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -318,6 +318,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -413,6 +413,37 @@ bool GetDeletionPreferenceFromDataType(
     BrowsingDataType data_type,
     ClearBrowsingDataTab clear_browsing_data_tab,
     std::string* out_pref) {
@@ -634,11 +867,12 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/components/browsing_data/core/clear_browsing_data_tab.h
 --- a/components/browsing_data/core/clear_browsing_data_tab.h
 +++ b/components/browsing_data/core/clear_browsing_data_tab.h
-@@ -18,7 +18,7 @@ namespace browsing_data {
- //
- // A Java counterpart will be generated for this enum.
- // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
+@@ -13,7 +13,8 @@ namespace browsing_data {
+ // value for dialogs without separate tabs is advanced.
+ // TODO(dullweber): Maybe rename "ADVANCED" to "DEFAULT" because it is used in
+ //   multiple places without a differentiation between advanced and basic.
 -enum class ClearBrowsingDataTab { BASIC, ADVANCED, MAX_VALUE = ADVANCED };
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
 +enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, MAX_VALUE = AT_START };
 
 }  // namespace browsing_data
@@ -646,7 +880,7 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
 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) {
+@@ -63,6 +63,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       kClearBrowsingDataHistoryNoticeShownTimes, 0);
 
@@ -673,7 +907,7 @@ diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_d
 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
-@@ -28,6 +28,16 @@ inline constexpr char kClearBrowsingDataOnExitDeletionPending[] =
+@@ -32,6 +32,16 @@ inline constexpr char kClearBrowsingDataOnExitDeletionPending[] =
 inline constexpr char kClearBrowsingDataOnExitList[] =
     "browser.clear_data.clear_on_exit";
 
@@ -690,10 +924,48 @@ 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/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc
+--- a/components/favicon/core/favicon_database.cc
+++ b/components/favicon/core/favicon_database.cc
+@@ -38,6 +38,10 @@
+ 
+ namespace favicon {
+ 
+CROMITE_FEATURE(kClearFaviconsData,
+                "ClearFaviconsData",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+
+ // Description of database tables:
+ //
+ // icon_mapping
+@@ -507,6 +511,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
+ 
+ bool FaviconDatabase::SetFaviconsOutOfDateBetween(base::Time begin,
+                                                   base::Time end) {
+  if (begin.is_null() && base::FeatureList::IsEnabled(kClearFaviconsData)) {
+    std::ignore = db_.Execute("DELETE FROM favicon_bitmaps");
+    std::ignore = db_.Execute("DELETE FROM favicons");
+    std::ignore = db_.Execute("DELETE FROM icon_mapping");
+  }
+   if (end.is_null())
+     end = base::Time::Max();
+   sql::Statement statement(
+diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h
+--- a/components/favicon/core/favicon_database.h
+++ b/components/favicon/core/favicon_database.h
+@@ -33,6 +33,8 @@ namespace favicon {
+ // All earlier updates are ignored.
+ static const int kFaviconUpdateLastRequestedAfterDays = 10;
+ 
+BASE_DECLARE_FEATURE(kClearFaviconsData);
+
+ // This database interface is owned by the history backend and runs on the
+ // history thread.
+ class FaviconDatabase {
 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
-@@ -764,6 +764,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -925,6 +925,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
     if (turl->date_created() >= created_after &&
         (created_before.is_null() || turl->date_created() < created_before) &&
         turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -701,10 +973,22 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
         turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
         (url_filter.is_null() ||
          url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
+diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
+--- a/content/browser/btm/btm_service_impl.cc
+++ b/content/browser/btm/btm_service_impl.cc
+@@ -262,7 +262,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+     remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
+     remover->RemoveWithFilterAndReply(
+         base::Time::Min(), base::Time::Max(),
+-        remove_mask | BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
+        remove_mask | content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE | BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
+         BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
+             BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
+         std::move(filter), clearer);
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1497,6 +1497,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1529,6 +1529,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
@@ -712,4 +996,38 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
     GetGeneratedCodeCacheContext()->Initialize(code_cache_path,
                                                settings.size_in_bytes());
   }
+diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h
+--- a/content/public/browser/browsing_data_remover.h
+++ b/content/public/browser/browsing_data_remover.h
+@@ -157,11 +157,16 @@ class BrowsingDataRemover {
+ 
+   // Clear-Site-Data Interaction with Prefetch and Prerender.
+   static constexpr DataType DATA_TYPE_PREFETCH_CACHE = 1 << 24;
+-  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 25;
+  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 26;
+ 
+   // Embedders can add more datatypes beyond this point.
+   static constexpr DataType DATA_TYPE_CONTENT_END = DATA_TYPE_PRERENDER_CACHE;
+ 
+  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 25;
+
+  static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_PRERENDER_CACHE,
+              "Please check.");
+
+   // All data stored by the Attribution Reporting API.
+   static constexpr DataType DATA_TYPE_ATTRIBUTION_REPORTING =
+       DATA_TYPE_ATTRIBUTION_REPORTING_SITE_CREATED |
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
+
+    {"clear-favicons-data",
+     "Clear favicons data",
+     "deletes all data from the favicons db when deleting at startup/close with cache selection.", kOsAll,
+     FEATURE_VALUE_TYPE(favicon::kClearFaviconsData)},
+
+#endif
 --
@@ -0,0 +1,336 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Thu, 9 Oct 2025 09:11:01 +0000
+Subject: Add setting to enable Credman for passkeys
+
+Enables Credential Manager for passkey management on A14+ devices via a switch
+in the settings. By default, the feature is disabled.
+In other versions of Android, webauthn appears to be enabled on websites but
+always returns a timeout error as per specifications.
+Conditional immediate support is disabled.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../settings/PasswordSettings.java            | 27 +++++++++++++++++
+ ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
+ .../webauthn/AuthenticatorImpl.java           | 29 +++++++------------
+ .../components/webauthn/WebauthnFeatures.java |  2 ++
+ .../cred_man/CredManSupportProvider.java      | 27 +++++------------
+ .../webauthn/android/webauthn_feature_map.cc  |  1 +
+ components/webauthn/features.cc               |  4 +++
+ components/webauthn/features.h                |  3 ++
+ device/fido/features.cc                       |  2 ++
+ .../authentication_credentials_container.cc   |  5 ++++
+ 10 files changed, 75 insertions(+), 37 deletions(-)
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+@@ -10,6 +10,7 @@ import android.app.Activity;
+ import android.content.Context;
+ import android.content.Intent;
+ import android.net.Uri;
+import android.os.Build;
+ import android.os.Bundle;
+ import android.text.SpannableString;
+ import android.text.style.ForegroundColorSpan;
+@@ -64,6 +65,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+ import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
+ 
+import org.chromium.chrome.browser.flags.CromiteNativeUtils;
+import org.chromium.components.webauthn.WebauthnFeatureMap;
+import org.chromium.components.webauthn.WebauthnFeatures;
+
+ /**
+  * The "Passwords" screen in Settings, which allows the user to enable or disable password saving,
+  * to view saved passwords (just the username and URL), and to delete saved passwords.
+@@ -322,6 +327,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+         createSavePasswordsSwitch();
+         createAutoSignInCheckbox();
+         createEnableAndroidAutofillSwitch();
+        createCredManSwitch();
+ 
+         PasswordManagerHandlerProvider.getForProfile(getProfile())
+                 .getPasswordManagerHandler()
+@@ -673,6 +679,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+                 getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_AUTOSIGNIN));
+     }
+ 
+    private void createCredManSwitch() {
+        ChromeSwitchPreference credManSwitch =
+                new ChromeSwitchPreference(getStyledContext(), null);
+        credManSwitch.setTitle(R.string.enable_android_credman_title);
+        credManSwitch.setOrder(0);
+        credManSwitch.setSummary(R.string.enable_android_credman_summary);
+        credManSwitch.setChecked(
+                WebauthnFeatureMap.getInstance().isEnabled(WebauthnFeatures.WEBAUTHN_ANDROID_PASSKEY));
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            credManSwitch.setSummary(R.string.enable_android_credman_disabled_summary);
+            credManSwitch.setEnabled(false);
+        }
+        credManSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+            CromiteNativeUtils.setFlagEnabled("WebAuthenticationAndroidPasskey", (boolean)newValue);
+            if (!mSnackbarManagerSupplier.get().isShowing())
+                mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
+            return true;
+        });
+        getPreferenceScreen().addPreference(credManSwitch);
+    }
+
+     private void displayManageAccountLink() {
+         SyncService syncService = SyncServiceFactory.getForProfile(getProfile());
+         if (syncService == null || !syncService.isEngineInitialized()) {
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
+@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_ENABLE_ANDROID_CREDMAN_TITLE" desc="" formatter_data="android_java">
+        Enable Android Credential Manager
+    </message>
+    <message name="IDS_ENABLE_ANDROID_CREDMAN_SUMMARY" desc="" formatter_data="android_java">
+        Enable support for Android Credential Manager
+    </message>
+    <message name="IDS_ENABLE_ANDROID_CREDMAN_DISABLED_SUMMARY" desc="" formatter_data="android_java">
+        Not supported on your device (require A14+)
+    </message>
+</grit-part>
+diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+@@ -34,6 +34,8 @@ import org.chromium.blink.mojom.PublicKeyCredentialReportOptions;
+ import org.chromium.blink.mojom.WebAuthnClientCapability;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+import org.chromium.components.webauthn.CredManSupport;
+import org.chromium.components.webauthn.cred_man.CredManSupportProvider;
+ import org.chromium.components.ukm.UkmRecorder;
+ import org.chromium.content_public.browser.RenderFrameHost;
+ import org.chromium.content_public.browser.WebContents;
+@@ -169,8 +171,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+         mIsPaymentRequest = options.isPaymentCredentialCreation;
+         mMakeCredentialCallback = callback;
+         mIsOperationPending = true;
+-        if (!GmsCoreUtils.isWebauthnSupported()
+-                || (!isChrome(mWebContents) && !GmsCoreUtils.isResultReceiverSupported())) {
+        if (CredManSupportProvider.getCredManSupport() == CredManSupport.DISABLED) {
+             recordOutcomeEvent(MakeCredentialOutcome.OTHER_FAILURE);
+             onError(AuthenticatorStatus.NOT_IMPLEMENTED);
+             return;
+@@ -234,8 +235,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+         mIsConditionalRequest = options.mediation == Mediation.CONDITIONAL;
+         mIsImmediateRequest = options.mediation == Mediation.IMMEDIATE;
+ 
+-        if (!GmsCoreUtils.isWebauthnSupported()
+-                || (!isChrome(mWebContents) && !GmsCoreUtils.isResultReceiverSupported())
+        if (CredManSupportProvider.getCredManSupport() == CredManSupport.DISABLED
+                 || options.publicKey == null) {
+             recordOutcomeEvent(GetAssertionOutcome.OTHER_FAILURE);
+             onError(AuthenticatorStatus.NOT_IMPLEMENTED);
+@@ -260,12 +260,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+     }
+ 
+     private boolean couldSupportConditionalMediation() {
+-        return GmsCoreUtils.isWebauthnSupported() && isChrome(mWebContents);
+        return isChrome(mWebContents);
+     }
+ 
+     private boolean couldSupportUvpaa() {
+-        return GmsCoreUtils.isWebauthnSupported()
+-                && (isChrome(mWebContents) || GmsCoreUtils.isResultReceiverSupported());
+        return isChrome(mWebContents);
+     }
+ 
+     @Override
+@@ -329,26 +328,20 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_GET,
+-                                            couldSupportConditionalMediation() && isUvpaa));
+                                            true));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_UVPAA,
+-                                            couldSupportUvpaa() && isUvpaa));
+-                            boolean conditionalCreateEnabled =
+-                                    couldSupportConditionalMediation()
+-                                            && DeviceFeatureMap.isEnabled(
+-                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE);
+                                            true));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_CREATE,
+-                                            isUvpaa && conditionalCreateEnabled));
+                                            DeviceFeatureMap.isEnabled(
+                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE)));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_IMMEDIATE_GET,
+-                                            DeviceFeatureMap.isEnabled(
+-                                                            DeviceFeatureList
+-                                                                    .WEBAUTHN_IMMEDIATE_GET)
+-                                                    && isUvpaa));
+                                            false));
+                             callback.call(capabilities.toArray(new WebAuthnClientCapability[0]));
+                         });
+     }
+diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
+--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
+@@ -16,4 +16,6 @@ import org.chromium.build.annotations.NullMarked;
+ public abstract class WebauthnFeatures {
+     public static final String WEBAUTHN_ANDROID_PASSKEY_CACHE_MIGRATION =
+             "WebAuthenticationAndroidPasskeyCacheMigration";
+    public static final String WEBAUTHN_ANDROID_PASSKEY =
+            "WebAuthenticationAndroidPasskey";
+ }
+diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
+--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
+++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
+@@ -19,9 +19,11 @@ import org.chromium.base.version_info.VersionInfo;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.components.webauthn.CredManSupport;
+-import org.chromium.components.webauthn.GmsCoreUtils;
+ import org.chromium.components.webauthn.WebauthnMode;
+ import org.chromium.components.webauthn.WebauthnModeProvider;
+import org.chromium.components.webauthn.WebauthnFeatureMap;
+import org.chromium.components.webauthn.WebauthnFeatures;
+import org.chromium.components.webauthn.WebauthnLogger;
+ 
+ @NullMarked
+ public class CredManSupportProvider {
+@@ -57,12 +59,12 @@ public class CredManSupportProvider {
+         }
+         if (getAndroidVersion() < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+             sCredManSupport = CredManSupport.DISABLED;
+-            log(TAG, "Disabled because of Android version.");
+            WebauthnLogger.logError(TAG, "Disabled because of Android version.");
+             return sCredManSupport;
+         }
+-        if (notSkippedBecauseInTests() && hasOldGmsVersion()) {
+        if (!WebauthnFeatureMap.getInstance().isEnabled(WebauthnFeatures.WEBAUTHN_ANDROID_PASSKEY)) {
+             sCredManSupport = CredManSupport.DISABLED;
+-            log(TAG, "Disabled because of old GMS version.");
+            WebauthnLogger.logError(TAG, "Disabled because of user.");
+             return sCredManSupport;
+         }
+         if (notSkippedBecauseInTests()
+@@ -70,14 +72,14 @@ public class CredManSupportProvider {
+                         == null) {
+             sCredManSupport = CredManSupport.DISABLED;
+             recordCredManAvailability(/*available*/ false);
+-            log(TAG, "Disabled because CredentialManager is not available.");
+            WebauthnLogger.logError(TAG, "Disabled because CredentialManager is not available.");
+             return sCredManSupport;
+         }
+         recordCredManAvailability(/*available*/ true);
+ 
+         final CredManUiRecommender recommender =
+                 ServiceLoaderUtil.maybeCreate(CredManUiRecommender.class);
+-        boolean customUiRecommended = recommender != null && recommender.recommendsCustomUi();
+        boolean customUiRecommended = true;
+         boolean gpmInCredMan =
+                 sOverrideForcesGpm != null ? sOverrideForcesGpm : customUiRecommended;
+         boolean isChrome3pPwmMode =
+@@ -116,13 +118,6 @@ public class CredManSupportProvider {
+                 "WebAuthentication.Android.CredManAvailability", available);
+     }
+ 
+-    private static boolean hasOldGmsVersion() {
+-        assert sOverrideAndroidVersion == null : "Don't use in testing!";
+-        // The check works for unavailable and low GMS versions. `getGmsCoreVersion()` is -1 if the
+-        // GMS version can't be retrieved. Chrome assumes an insufficient GMS availability then.
+-        return GmsCoreUtils.getGmsCoreVersion() < getMinGmsVersionForCurrentChannel();
+-    }
+-
+     private static int getAndroidVersion() {
+         return sOverrideAndroidVersion == null ? Build.VERSION.SDK_INT : sOverrideAndroidVersion;
+     }
+@@ -130,10 +125,4 @@ public class CredManSupportProvider {
+     private static boolean notSkippedBecauseInTests() {
+         return sOverrideForcesGpm == null && sOverrideAndroidVersion == null;
+     }
+-
+-    private static int getMinGmsVersionForCurrentChannel() {
+-        return (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild())
+-                ? GMSCORE_MIN_VERSION_BETA_STABLE
+-                : GMSCORE_MIN_VERSION_CANARY_DEV;
+-    }
+ }
+diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/webauthn/android/webauthn_feature_map.cc
+--- a/components/webauthn/android/webauthn_feature_map.cc
+++ b/components/webauthn/android/webauthn_feature_map.cc
+@@ -16,6 +16,7 @@ namespace {
+ // Array of features exposed through the Java WebauthnFeatureMap API.
+ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kWebAuthnAndroidPasskeyCacheMigration,
+    &kWebAuthnAndroidPasskey,
+ };
+ 
+ // static
+diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc
+--- a/components/webauthn/features.cc
+++ b/components/webauthn/features.cc
+@@ -16,6 +16,10 @@ BASE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration,
+              "WebAuthenticationAndroidPasskeyCacheMigration",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+CROMITE_FEATURE(kWebAuthnAndroidPasskey,
+                "WebAuthenticationAndroidPasskey",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ }  // namespace webauthn::features
+diff --git a/components/webauthn/features.h b/components/webauthn/features.h
+--- a/components/webauthn/features.h
+++ b/components/webauthn/features.h
+@@ -20,6 +20,9 @@ namespace webauthn::features {
+ COMPONENT_EXPORT(WEBAUTHN)
+ BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration);
+ 
+COMPONENT_EXPORT(WEBAUTHN)
+BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskey);
+
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ }  // namespace webauthn::features
+diff --git a/device/fido/features.cc b/device/fido/features.cc
+--- a/device/fido/features.cc
+++ b/device/fido/features.cc
+@@ -163,6 +163,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
+ #else
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_ANDROID)
+SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGet);
+ 
+ BASE_FEATURE_PARAM(int,
+                    kWebAuthnImmediateMediationTimeoutMilliseconds,
+@@ -175,6 +176,7 @@ BASE_FEATURE_PARAM(int,
+ BASE_FEATURE(kWebAuthnImmediateGetAutoselect,
+              "WebAuthenticationImmediateGetAutoselect",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGetAutoselect);
+ 
+ #if BUILDFLAG(IS_MAC)
+ // Default enabled in M139. Remove in or after M142.
+diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
+--- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
+++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
+@@ -1057,6 +1057,11 @@ DOMException* AuthenticatorStatusToDOMException(
+     const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) {
+   DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS,
+             dom_exception_details.is_null());
+  if (status == AuthenticatorStatus::UNKNOWN_ERROR ||
+      status == AuthenticatorStatus::NOT_IMPLEMENTED) {
+      status = AuthenticatorStatus::NOT_ALLOWED_ERROR;
+      base::PlatformThread::Sleep(base::Milliseconds(base::RandInt(1000, 6000)));
+  }
+   switch (status) {
+     case AuthenticatorStatus::SUCCESS:
+       NOTREACHED();
+--
@@ -8,18 +8,19 @@ The feature can be activated from the accessibility settings.
 Need: bromite-build-utils.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../AwContextMenuItemDelegate.java            |  4 +++
 chrome/android/java/res/values/ids.xml        |  1 +
- .../settings/AccessibilitySettings.java       | 12 +++++++
 .../ChromeAccessibilitySettingsDelegate.java  | 18 ++++++++++
 .../contextmenu/ChromeContextMenuItem.java    |  5 ++-
 .../ChromeContextMenuPopulator.java           |  5 +++
 .../tab/TabContextMenuItemDelegate.java       |  8 +++++
- .../contextmenu/ContextMenuItemDelegate.java  |  2 ++
 .../flags/android/chrome_feature_list.cc      |  1 +
 .../browser/flags/ChromeFeatureList.java      |  5 +++
 .../strings/android_chrome_strings.grd        |  9 +++++
 .../res/xml/accessibility_preferences.xml     |  5 +++
+ .../accessibility/AccessibilitySettings.java  | 12 +++++++
 .../AccessibilitySettingsDelegate.java        |  2 ++
+ .../contextmenu/ContextMenuItemDelegate.java  |  3 ++
 ...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 +
@@ -27,17 +28,38 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../renderer/core/html/html_anchor_element.h  |  7 +++-
 .../renderer/core/html/html_image_element.cc  | 17 +++++++++
 .../renderer/core/html/html_image_element.h   |  2 ++
- .../core/page/context_menu_controller.cc      | 33 ++++++++++++-----
+ .../core/page/context_menu_controller.cc      | 23 +++++++++---
 .../core/page/context_menu_controller.h       |  5 +--
- 21 files changed, 165 insertions(+), 20 deletions(-)
+ 22 files changed, 164 insertions(+), 16 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc

+diff --git a/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
+--- a/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
+++ b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
+@@ -11,6 +11,7 @@ import android.net.Uri;
+ import org.chromium.base.IntentUtils;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.components.embedder_support.contextmenu.ContextMenuItemDelegate;
+import org.chromium.content_public.common.Referrer;
+ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.ui.base.Clipboard;
+ import org.chromium.url.GURL;
+@@ -52,6 +53,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
+         IntentUtils.safeStartActivity(mActivity, intent);
+     }
+ 
+    @Override
+    public void onOpenUrl(GURL url, Referrer referrer) { }
+
+     @Override
+     public GURL getPageUrl() {
+         return mWebContents.getVisibleUrl();
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -91,6 +91,7 @@ found in the LICENSE file.
+@@ -107,6 +107,7 @@ found in the LICENSE file.
 
     <!-- Menu item IDs for FullscreenActivities -->
     <item type="id" name="contextmenu_open_in_chrome" />
@@ -45,57 +67,21 @@ 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
-             mSnackbarManager.showSnackbar(mSnackbar);
+@@ -165,6 +165,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+             mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
     }
 
 +    private static class ShowAlwaysContextMenuOnLinksDelegate implements BooleanPreferenceDelegate {
 +        @Override
-+        public boolean isEnabled() {
+        public boolean getValue() {
 +            return ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled();
 +        }
 +
 +        @Override
-+        public void setEnabled(boolean value) {
+        public void setValue(boolean value) {
 +            CromiteNativeUtils.setFlagEnabled(ChromeFeatureList.SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS,
 +                    "show-always-context-menu-on-links", value);
 +        }
@@ -112,38 +98,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
-@@ -111,8 +111,9 @@ class ChromeContextMenuItem {
-         int SHARE_HIGHLIGHT = 32;
-         int REMOVE_HIGHLIGHT = 33;
-         int LEARN_MORE = 34;
-+        int FOLLOW_LINK = 35;
+@@ -132,8 +132,9 @@ class ChromeContextMenuItem {
+         int PRINT_PAGE = 40;
+         // Developer Group
+         int INSPECT_ELEMENT = 41;
+        int FOLLOW_LINK = 42;
         // ALWAYS UPDATE!
-        int NUM_ENTRIES = 35;
-+        int NUM_ENTRIES = 36;
+-        int NUM_ENTRIES = 42;
+        int NUM_ENTRIES = 43;
     }
 
     /** Mapping from {@link Item} to the ID found in the ids.xml. */
-@@ -152,6 +153,7 @@ class ChromeContextMenuItem {
-         R.id.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
-         R.id.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
-         R.id.contextmenu_learn_more, // Item.LEARN_MORE
-+            R.id.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
+@@ -180,6 +181,7 @@ class ChromeContextMenuItem {
+         R.id.contextmenu_share_page, // Item.SHARE_PAGE
+         R.id.contextmenu_print_page, // Item.PRINT_PAGE
+         R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
+        R.id.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
     };
 
     /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
-@@ -191,6 +193,7 @@ class ChromeContextMenuItem {
-         R.string.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
-         R.string.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
-         R.string.contextmenu_learn_more, // Item.LEARN_MORE
-+            R.string.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB:
+@@ -226,6 +228,7 @@ class ChromeContextMenuItem {
+         R.string.contextmenu_share_page, // Item.SHARE_PAGE
+         R.string.contextmenu_print_page, // Item.PRINT_PAGE
+         R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
+        R.string.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
     };
 
     /**
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -266,6 +266,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
- 
+@@ -447,6 +447,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+         }
         if (mParams.isAnchor()) {
             ModelList linkGroup = new ModelList();
 +            if (ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled()) {
@@ -152,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
             if (FirstRunStatus.getFirstRunFlowComplete()
                     && !isEmptyUrl(mParams.getUrl())
                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -631,6 +634,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -1039,6 +1042,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                 getProfile(),
                                 false);
                     });
@@ -164,7 +150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -273,6 +273,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -370,6 +370,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
         mTab.loadUrl(loadUrlParams);
     }
 
@@ -175,66 +161,54 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 +        loadUrlParams.setReferrer(referrer);
 +        mTab.loadUrl(loadUrlParams);
 +    }
-+
-     @Override
-     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
-         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-diff --git a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java b/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java
--- a/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java
-+++ b/chrome/browser/contextmenu/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java
-@@ -110,6 +110,8 @@ public interface ContextMenuItemDelegate {
-      */
-     void onOpenImageUrl(GURL url, Referrer referrer);
- 
-+    void onOpenUrl(GURL url, Referrer referrer);
 +
     /**
-      * Called when the {@code url} is of an image and should be opened in a new tab.
-      * @param url The image URL to open.
+      * Called when the {@code url} is of an image and should be opened in a new page.
+      *
 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
-@@ -287,6 +287,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kTabIdMapAndroid,
-     &kTabletTabSwitcherLongPressMenu,
-     &kTabletToolbarIncognitoStatus,
+@@ -429,6 +429,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabGroupParityBottomSheetAndroid,
+     &kTabModelInitFixes,
+     &kTabStorageSqlitePrototype,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
-     &kTabletToolbarReordering,
-     &kTabResumptionModuleAndroid,
-     &kTabStateFlatBuffer,
+     &kTabStripAutoSelectOnCloseChange,
+     &kTabStripDensityChangeAndroid,
+     &kTabStripGroupDragDropAndroid,
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -348,6 +348,8 @@ public abstract class ChromeFeatureList {
+@@ -503,6 +503,8 @@ public abstract class ChromeFeatureList {
             "DisableToolbarSwipeUp";
     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
             "MoveTopToolbarToBottom";
 +    public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS =
 +            "ShowAlwaysContextMenuOnLinks";
-     public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
-     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
-             "NotificationPermissionBottomSheet";
-@@ -630,6 +632,8 @@ public abstract class ChromeFeatureList {
+     public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
+             "NewTabPageCustomizationToolbarButton";
+     public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2";
+@@ -1035,6 +1037,8 @@ public abstract class ChromeFeatureList {
             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
     public static final CachedFlag sMoveTopToolbarToBottom =
             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
 +    public static final CachedFlag sShowAlwaysContextMenuOnLinks =
 +            newCachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false);
-     public static final CachedFlag sOmniboxModernizeVisualUpdate =
-             newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true);
-     public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -786,6 +790,7 @@ public abstract class ChromeFeatureList {
-                     sTabWindowManagerIndexReassignmentActivityNotInAppTasks,
-                     sTabWindowManagerReportIndicesMismatch,
-                     sUseChimeAndroidSdk,
+     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
+     public static final CachedFlag sPostGetMyMemoryStateToBackground =
+             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
+@@ -1289,6 +1293,7 @@ public abstract class ChromeFeatureList {
+                     sTopControlsRefactor,
+                     sTouchToSearchCallout,
+                     sTraceBinderIpc,
 +                    sShowAlwaysContextMenuOnLinks,
-                     sUseLibunwindstackNativeUnwinderAndroid,
-                     sVerticalAutomotiveBackButtonToolbar);
- 
+                     sUseActivityManagerForTabActivation,
+                     sUseChimeAndroidSdk,
+                     sUseInitialNetworkStateAtStartup,
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1683,6 +1683,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1548,6 +1548,12 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
         Disable toolbar swipe up
       </message>
@@ -247,7 +221,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 
       <!-- Safety check -->
       <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
-@@ -2862,6 +2868,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -3189,6 +3195,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
       <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
         Open in new Chrome tab
       </message>
@@ -260,7 +234,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -35,6 +35,11 @@ found in the LICENSE file.
+@@ -31,6 +31,11 @@ found in the LICENSE file.
         android:summary="@string/page_zoom_always_show_preference_summary"
         android:title="@string/page_zoom_always_show_preference_title" />
 
@@ -272,18 +246,74 @@ 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
+@@ -53,6 +53,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
+     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
+ 
+    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
+    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
+
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -139,6 +142,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
+         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
+ 
+        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
+        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
+        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.getValue());
+        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
+
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -220,6 +229,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
+             mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
+             mDelegate.requestRestart(getActivity());
+        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
+            mShowAlwaysContextMenuOnLinksDelegate.setValue((Boolean) newValue);
+            mDelegate.requestRestart(getActivity());
+         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
+             // TODO(mschillaci): Implement the override behavior for OS level.
+         } else if (OmniboxFeatures.KEY_JUMP_START_OMNIBOX.equals(preference.getKey())) {
 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 {
+@@ -45,6 +45,8 @@ public interface AccessibilitySettingsDelegate {
     BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate();
     BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate();
 
 +    BooleanPreferenceDelegate getShowAlwaysContextMenuOnLinksDelegate();
 +
-     /** @return The BrowserContextHandle that should be used to read and update settings. */
-     BrowserContextHandle getBrowserContextHandle();
+     /**
+      * @return The BrowserContextHandle that should be used to read and update settings.
+      */
+diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
+--- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
+++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
+@@ -10,6 +10,7 @@ import androidx.annotation.IntDef;
 
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_public.common.Referrer;
+ import org.chromium.url.GURL;
+ 
+ import java.lang.annotation.Retention;
+@@ -150,6 +151,8 @@ public interface ContextMenuItemDelegate {
+      */
+     GURL getPageUrl();
+ 
+    void onOpenUrl(GURL url, Referrer referrer);
+
+     /**
+      * Called when the current embedder app is not the default to handle a View Intent.
+      *
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc
 new file mode 100644
 --- /dev/null
@@ -314,24 +344,24 @@ 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 @@
+@@ -67,6 +67,7 @@
 #include "third_party/blink/renderer/core/loader/render_blocking_resource_manager.h"
 #include "third_party/blink/renderer/core/navigation_api/navigation_api.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
 +#include "third_party/blink/renderer/core/page/context_menu_controller.h"
 #include "third_party/blink/renderer/core/page/page.h"
+ #include "third_party/blink/renderer/core/scroll/scroll_into_view_util.h"
 #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
- #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -518,6 +519,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
-                                             bool is_trusted,
-                                             base::TimeTicks platform_time_stamp,
-                                             KURL completed_url) {
+@@ -467,6 +468,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+     bool is_trusted,
+     base::TimeTicks platform_time_stamp,
+     KURL completed_url) {
 +  UIEvent& event = *UIEvent::Create();
 +  NavigateToHyperlink2(std::move(request), navigation_policy, is_trusted, platform_time_stamp,
 +    std::move(completed_url), event, true);
 +}
 +
-+void HTMLAnchorElement::NavigateToHyperlink2(ResourceRequest request,
+void HTMLAnchorElementBase::NavigateToHyperlink2(ResourceRequest request,
 +                                            NavigationPolicy navigation_policy,
 +                                            bool is_trusted,
 +                                            base::TimeTicks platform_time_stamp,
@@ -340,8 +370,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   LocalDOMWindow* window = GetDocument().domWindow();
   if (!window) {
     return;
-@@ -578,6 +590,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
-             /*element=*/this, request.HasUserGesture()));
+@@ -557,6 +569,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+     frame_request.SetImpression(impression);
   }
 
 +  if (!do_not_show_context_menu &&
@@ -356,39 +386,39 @@ 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;
 
-@@ -631,7 +652,7 @@ AtomicString HTMLAnchorElement::interestAction() const {
-   return g_empty_atom;
+@@ -600,7 +621,7 @@ Element* HTMLAnchorElementBase::InterestForElement() const {
+       html_names::kInterestforAttr);
 }
 
-void HTMLAnchorElement::HandleClick(MouseEvent& event) {
-+void HTMLAnchorElement::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
+-void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+void HTMLAnchorElementBase::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
   event.SetDefaultHandled();
 
   LocalDOMWindow* window = GetDocument().domWindow();
-@@ -727,13 +748,12 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -658,13 +679,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     return;
   }
 
-  base::OnceClosure navigate_closure = WTF::BindOnce(
-      &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this),
+-  base::OnceClosure navigate_closure = blink::BindOnce(
+-      &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 -      std::move(request), navigation_policy, event.isTrusted(),
 -      event.PlatformTimeStamp(), std::move(completed_url));
 -
   if (navigation_policy == kNavigationPolicyDownload ||
       navigation_policy == kNavigationPolicyLinkPreview) {
-+    base::OnceClosure navigate_closure = WTF::BindOnce(
-+        &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this),
+    base::OnceClosure navigate_closure = blink::BindOnce(
+        &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 +        std::move(request), navigation_policy, event.isTrusted(),
 +        event.PlatformTimeStamp(), std::move(completed_url));
     // We distinguish single/double click with some modifiers.
     // See the comment of `EventHandler.delayed_navigation_task_handle_`.
     auto task_handle = PostDelayedCancellableTask(
-@@ -743,7 +763,9 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -674,7 +694,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     frame->GetEventHandler().SetDelayedNavigationTaskHandle(
         std::move(task_handle));
   } else {
 -    std::move(navigate_closure).Run();
-+    HTMLAnchorElement::NavigateToHyperlink2(std::move(request), navigation_policy,
+    HTMLAnchorElementBase::NavigateToHyperlink2(std::move(request), navigation_policy,
 +      event.isTrusted(), event.PlatformTimeStamp(), std::move(completed_url),
 +      event, do_not_show_context_menu);
   }
@@ -397,15 +427,15 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
-@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
-   AtomicString interestAction() const override;
+@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
+   Element* InterestForElement() const override;
 
   void Trace(Visitor*) const override;
 +  void HandleClick(MouseEvent&, 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 {
+   HTMLAnchorElementBase(const QualifiedName& tag_name, Document&);
+@@ -143,7 +144,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
                            bool is_trusted,
                            base::TimeTicks platform_time_stamp,
                            KURL);
@@ -437,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 #include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
 #include "third_party/blink/renderer/core/probe/core_probes.h"
 #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
-@@ -799,6 +801,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -786,6 +788,21 @@ void HTMLImageElement::DidFinishLayout() {
   }
 }
 
@@ -462,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -236,6 +236,8 @@ class CORE_EXPORT HTMLImageElement final
+@@ -216,6 +216,8 @@ class CORE_EXPORT HTMLImageElement
   void DidAddUserAgentShadowRoot(ShadowRoot&) override;
   void AdjustStyle(ComputedStyleBuilder&) override;
 
@@ -474,7 +504,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc
 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -228,14 +228,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -200,15 +200,17 @@ void ContextMenuController::DocumentDetached(Document* document) {
   }
 }
 
@@ -484,7 +514,8 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
 +  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
 +    DCHECK(mouse_event->type() == event_type_names::kContextmenu);
 +  }
-   LocalFrame* frame = mouse_event->target()->ToNode()->GetDocument().GetFrame();
+   LocalFrame* frame =
+       mouse_event->RawTarget()->ToNode()->GetDocument().GetFrame();
   PhysicalOffset location =
       PhysicalOffset::FromPointFRound(mouse_event->AbsoluteLocation());
 
@@ -494,7 +525,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
     mouse_event->SetDefaultHandled();
 }
 
-@@ -453,7 +455,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -433,7 +435,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
 bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                             const PhysicalOffset& point,
                                             WebMenuSourceType source_type,
@@ -504,14 +535,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,
-@@ -476,6 +479,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -456,6 +459,16 @@ 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;
+      MouseEvent& event = *MouseEvent::Create();
 +      event.SetTarget(mouse_event->target());
 +      anchor_element->HandleClick(event, /*do_not_show_context_menu*/true);
 +      return true;
@@ -521,29 +552,19 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
   // Clear any previously set cached results if we are resetting the hit test
   // result.
   image_selection_cached_result_ = nullptr;
-@@ -830,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
-   SetAutofillData(result.InnerNode(), data);
-   SetPasswordManagerData(result.InnerElement(), data);
+@@ -837,7 +850,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+ 
+   SetAutofillData(result.InnerNode(), data);
 
-  const bool from_touch = source_type == kMenuSourceTouch ||
-                          source_type == kMenuSourceLongPress ||
-                          source_type == kMenuSourceLongTap;
 -  if (from_touch && !ShouldShowContextMenuFromTouch(data))
-    return false;
-+  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
-+    const bool from_touch = source_type == kMenuSourceTouch ||
-+                            source_type == kMenuSourceLongPress ||
-+                            source_type == kMenuSourceLongTap;
-+    if (from_touch && !ShouldShowContextMenuFromTouch(data))
-+      return false;
-+  }
+  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks) && from_touch && !ShouldShowContextMenuFromTouch(data))
+     return false;
 
   WebLocalFrameImpl* selected_web_frame =
-       WebLocalFrameImpl::FromFrame(selected_frame);
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h
 --- a/third_party/blink/renderer/core/page/context_menu_controller.h
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.h
-@@ -57,7 +57,7 @@ class CORE_EXPORT ContextMenuController final
+@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController final
 
   void DocumentDetached(Document*);
 
@@ -552,7 +573,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th
   void ShowContextMenuAtPoint(LocalFrame*,
                               float x,
                               float y,
-@@ -123,7 +123,8 @@ class CORE_EXPORT ContextMenuController final
+@@ -125,7 +125,8 @@ class CORE_EXPORT ContextMenuController final
   bool ShowContextMenu(LocalFrame*,
                        const PhysicalOffset&,
                        WebMenuSourceType,
@@ -24,18 +24,18 @@ 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 @@
- #include "components/send_tab_to_self/features.h"
+@@ -169,6 +169,7 @@
+ #include "components/sensitive_content/features.h"
 #include "components/services/heap_profiling/public/cpp/switches.h"
 #include "components/services/storage/public/cpp/buckets/bucket_info.h"
 +#include "components/site_engagement/core/features.h"
 #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
+ #include "components/sharing_message/features.h"
 #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
- #include "components/signin/public/base/signin_buildflags.h"
 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 @@
+@@ -31,6 +31,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"
-@@ -388,6 +389,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -344,6 +345,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;
 
-@@ -402,6 +407,10 @@ std::vector<ImportantDomainInfo>
+@@ -358,6 +363,10 @@ std::vector<ImportantDomainInfo>
 ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
                                                     size_t max_results) {
   SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime");
@@ -68,23 +68,23 @@ 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(
+@@ -306,6 +307,8 @@ TrackerImpl::TrackerImpl(
 TrackerImpl::~TrackerImpl() = default;
 
 void TrackerImpl::NotifyEvent(const std::string& event) {
 +  if (!base::FeatureList::IsEnabled(site_engagement::features::kSiteEngagement))
 +    return;
-   event_model_->IncrementEvent(event, time_provider_->GetCurrentDay());
+   GetEventModelWriter()->IncrementEvent(event, time_provider_->GetCurrentDay());
   stats::RecordNotifyEvent(event, configuration_.get(),
-                            event_model_->IsReady());
+                            event_model_provider_->IsReady());
 diff --git a/components/feature_engagement/public/feature_configurations.cc b/components/feature_engagement/public/feature_configurations.cc
 --- a/components/feature_engagement/public/feature_configurations.cc
 +++ b/components/feature_engagement/public/feature_configurations.cc
@@ -96,7 +96,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 #include "components/feature_engagement/public/configuration.h"
 #include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/feature_constants.h"
-@@ -112,6 +113,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
   }
 
 #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -108,11 +108,11 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 +
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
     BUILDFLAG(IS_CHROMEOS)
-   if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
+   if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
 diff --git a/components/site_engagement/content/site_engagement_score.cc b/components/site_engagement/content/site_engagement_score.cc
 --- a/components/site_engagement/content/site_engagement_score.cc
 +++ b/components/site_engagement/content/site_engagement_score.cc
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/content_settings/core/common/content_settings_utils.h"
@@ -120,7 +120,7 @@ diff --git a/components/site_engagement/content/site_engagement_score.cc b/compo
 #include "components/site_engagement/content/engagement_type.h"
 #include "components/site_engagement/content/site_engagement_metrics.h"
 #include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom.h"
-@@ -275,6 +276,10 @@ void SiteEngagementScore::Commit() {
+@@ -276,6 +277,10 @@ void SiteEngagementScore::Commit() {
   if (!UpdateScoreDict(*score_dict_))
     return;
 
@@ -12,16 +12,16 @@ 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
-@@ -88,6 +88,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;
+@@ -56,6 +56,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
+ import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
- import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
- import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
- import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
-@@ -460,8 +461,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
-             finish();
+ import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
+ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
+ import org.chromium.components.browser_ui.settings.SettingsFragment;
+@@ -485,8 +486,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+             finishCurrentSettings(mainFragment);
             return true;
         } else if (item.getItemId() == R.id.menu_id_general_help) {
 -            HelpAndFeedbackLauncherImpl.getForProfile(mProfile)
@@ -38,13 +38,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
-@@ -91,4 +91,8 @@ public class SettingsUtils {
-         ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility);
-         return true;
-     }
-+
+@@ -28,6 +28,10 @@ import org.chromium.ui.drawable.StateListDrawableBuilder;
+ /** A helper class for Settings. */
+ @NullMarked
+ public class SettingsUtils {
 +    public interface ISupportHelpAndFeedback {
 +        void onHelpAndFeebackPressed();
 +    }
- }
+
+     /**
+      * A helper that is used to load preferences from XML resources without causing a
+      * StrictModeViolation. See http://crbug.com/692125.
 --
@@ -15,8 +15,8 @@ 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
-@@ -30,6 +30,16 @@ File OpenContentUriForRead(const FilePath& content_uri) {
-   return File(fd);
+@@ -137,6 +137,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
+                        Time::FromMillisecondsSinceUnixEpoch(last_modified));
 }
 
 +File OpenContentUriForWrite(const FilePath& content_uri) {
@@ -30,37 +30,37 @@ diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.
 +}
 +
 std::string GetContentUriMimeType(const FilePath& content_uri) {
-   JNIEnv* env = base::android::AttachCurrentThread();
-   ScopedJavaLocalRef<jstring> j_uri =
+   JNIEnv* env = android::AttachCurrentThread();
+   return Java_ContentUriUtils_getMimeType(env, content_uri.value());
 diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
 --- a/base/android/content_uri_utils.h
 +++ b/base/android/content_uri_utils.h
-@@ -18,6 +18,10 @@ namespace base {
- // Returns -1 if the URI is invalid.
- BASE_EXPORT File OpenContentUriForRead(const FilePath& content_uri);
+@@ -46,6 +46,10 @@ int ContentUriGetFd(
+ void ContentUriClose(
+     const base::android::JavaRef<jobject>& java_parcel_file_descriptor);
 
 +// Opens a content URI for write and returns the file descriptor to the caller.
 +// Returns -1 if the URI is invalid.
 +BASE_EXPORT File OpenContentUriForWrite(const FilePath& content_uri);
 +
- // Check whether a content URI exists.
- BASE_EXPORT bool ContentUriExists(const FilePath& content_uri);
- 
+ // Returns true if file exists and results are populated, else returns false.
+ bool ContentUriGetFileInfo(const FilePath& content_uri,
+                            FileEnumerator::FileInfo* results);
 diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java
 --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java
 +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java
-@@ -23,6 +23,9 @@ import org.jni_zero.CalledByNative;
- import java.io.File;
+@@ -31,6 +31,9 @@ import org.chromium.build.annotations.Nullable;
 import java.io.IOException;
+ import java.util.List;
 
 +import android.system.Os;
 +import android.content.ContentProviderClient;
 +
 /** This class provides methods to access content URI schemes. */
- public abstract class ContentUriUtils {
-     private static final String TAG = "ContentUriUtils";
-@@ -87,6 +90,36 @@ public abstract class ContentUriUtils {
-         return -1;
+ @JNINamespace("base")
+ @NullMarked
+@@ -72,6 +75,36 @@ public abstract class ContentUriUtils {
+         StreamUtil.closeQuietly(parcelFileDescriptor);
     }
 
 +    @CalledByNative
@@ -52,7 +52,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -65,8 +65,8 @@ new file mode 100644
 +public class BromiteWebGLContentSetting extends BromiteCustomContentSetting {
 +    public BromiteWebGLContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.WEBGL,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*defaultEnabledValue*/ ContentSetting.ALLOW,
+              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "webgl",
 +              /*profilePrefKey*/ "webgl");
@@ -85,11 +85,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
+            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_webgl_enabled;
-+            case ContentSettingValues.BLOCK:
+            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_webgl_disabled;
 +            default:
 +                return 0;
@@ -117,8 +117,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
+        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/webgl.grdp b/components/browser_ui/strings/bromite_content_settings/webgl.grdp
@@ -166,7 +166,7 @@ new file mode 100644
 +           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
 +           WebsiteSettingsRegistry::ALL_PLATFORMS,
 +           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
+           PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 +
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::WEBGL)
@@ -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
-@@ -84,6 +84,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
+@@ -86,6 +86,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
-@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -114,6 +114,8 @@ enum ReasonForCallingCanExecuteScripts {
 
 enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
 
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -313,6 +313,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -345,6 +345,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
   }
 }
 
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
   base::AutoLock locker(WebGLContextLimitLock());
   DCHECK(webgl_context_limits_initialized_);
-@@ -586,25 +593,6 @@ static String ExtractWebGLContextCreationError(
+@@ -615,25 +622,6 @@ static String ExtractWebGLContextCreationError(
     const Platform::GraphicsInfo& info) {
   StringBuilder builder;
   builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                           builder);
   builder.Append('.');
-@@ -664,6 +652,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -694,6 +682,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
-@@ -1978,6 +1978,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+@@ -1959,6 +1959,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                         DOMArrayBufferView* pixels,
                         int64_t offset);
 
@@ -12,9 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bromite_content_settings/webrtc.inc       | 22 +++++
 .../bromite_content_settings/WEBRTC.inc       |  1 +
 .../peer_connection_dependency_factory.cc     |  6 ++
- .../peerconnection/rtc_rtp_receiver.cc        | 10 ++
- .../modules/peerconnection/rtc_rtp_sender.cc  | 10 ++
- 7 files changed, 170 insertions(+)
+ .../peerconnection/rtc_rtp_receiver.cc        | 11 +++
+ .../modules/peerconnection/rtc_rtp_sender.cc  | 11 +++
+ 7 files changed, 172 insertions(+)
 create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteWebRTCContentSetting.java
 create mode 100644 components/browser_ui/strings/bromite_content_settings/webrtc.grdp
 create mode 100644 components/content_settings/core/browser/bromite_content_settings/webrtc.inc
@@ -49,7 +49,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -62,8 +62,8 @@ new file mode 100644
 +public class BromiteWebRTCContentSetting extends BromiteCustomContentSetting {
 +    public BromiteWebRTCContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.WEBRTC,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*defaultEnabledValue*/ ContentSetting.ALLOW,
+              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "webrtc",
 +              /*profilePrefKey*/ "webrtc");
@@ -82,11 +82,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
+            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_webrtc_enabled;
-+            case ContentSettingValues.BLOCK:
+            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_webrtc_disabled;
 +            default:
 +                // this will cause a runtime exception
@@ -115,8 +115,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
+        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/webrtc.grdp b/components/browser_ui/strings/bromite_content_settings/webrtc.grdp
@@ -164,7 +164,7 @@ new file mode 100644
 +           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
 +           WebsiteSettingsRegistry::ALL_PLATFORMS,
 +           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
+           PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 +
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::WEBRTC)
@@ -187,7 +187,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -41,6 +41,7 @@
+@@ -46,6 +46,7 @@
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
@@ -195,31 +195,32 @@ 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"
-@@ -838,6 +839,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -1023,6 +1024,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+       // |request_multiple_routes|. Whether local IP addresses could be
+       // collected depends on if mic/camera permission is granted for this
       // origin.
-       WebRTCIPHandlingPolicy policy =
-           GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
 +      blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient();
 +      if (settings && settings->AllowContentSetting(ContentSettingsType::WEBRTC, false)) {
-+        policy = kDefault;
+        webrtc_ip_handling_policy = mojom::blink::WebRtcIpHandlingPolicy::kDefault;
 +      }
 +
-       switch (policy) {
+       switch (webrtc_ip_handling_policy) {
         // TODO(guoweis): specify the flag of disabling local candidate
         // collection when webrtc is updated.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
-@@ -12,6 +12,8 @@
+@@ -16,6 +16,9 @@
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
-@@ -312,6 +314,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -287,6 +290,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -237,16 +238,17 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
-@@ -17,6 +17,8 @@
+@@ -21,6 +21,9 @@
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1070,6 +1072,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1034,6 +1037,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -3,23 +3,44 @@ Date: Mon, 7 Aug 2023 11:02:18 +0000
 Subject: Allow DocumentPiP if PopupsAndRedirects are active

 Allow documentPiP api use only with content setting popup allowed
+and disables the possibility of verifying the activation of PIP
+in the device with document.pictureInPictureEnabled

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../chromium/chrome/browser/media/PictureInPicture.java    | 1 +
 .../picture_in_picture_controller_impl.cc                  | 7 +++++++
- 1 file changed, 7 insertions(+)
+ 2 files changed, 8 insertions(+)

+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+@@ -29,6 +29,7 @@ public abstract class PictureInPicture {
+      * @return boolean true if Picture-In-Picture is enabled, otherwise false.
+      */
+     public static boolean isEnabled(Context context) {
+        if ((true)) return true;
+         // Some versions of Android crash when the activity enters Picture-in-Picture
+         // immediately after it exits Picture-in-Picture. See b/143784148
+         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
 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
-@@ -368,6 +368,13 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -31,6 +31,7 @@
+ #include "third_party/blink/renderer/core/layout/layout_video.h"
+ #include "third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture.h"
+ #include "third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h"
+#include "third_party/blink/renderer/core/loader/document_loader.h"
+ #include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h"
+ #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+@@ -386,6 +387,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
     return;
   }
 
-+  if (!opener.GetFrame()->GetContentSettings()->allow_popup) {
-+    exception_state.ThrowDOMException(DOMExceptionCode::kNotAllowedError,
-+                                      "Document PiP requires user popup permission");
-+    resolver->Reject(exception_state);
+  if (!opener.GetFrame()->Loader().GetDocumentLoader()->GetContentSettings()->allow_popup) {
+    resolver->RejectWithDOMException(DOMExceptionCode::kNotAllowedError,
+                                     "Document PiP requires user popup permission");
 +    return;
 +  }
 +
@@ -7,24 +7,26 @@ 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 +++++++---------
+ .../dip/document_isolation_policy_reporter.cc    |  3 +++
 .../web_package/signed_exchange_reporter.cc      |  2 ++
 ...content_switch_dependent_feature_overrides.cc |  1 +
 .../Allow-building-without-enable_reporting.inc  |  2 ++
- net/base/features.cc                             |  1 +
+ net/reporting/reporting_header_parser.cc         |  1 +
 net/reporting/reporting_service.cc               |  6 ++++++
- services/network/network_context.h               |  4 ++--
+ services/network/network_context.h               |  6 +++---
+ services/network/public/cpp/parsed_headers.cc    |  1 +
 services/network/public/mojom/BUILD.gn           |  1 -
- .../network/public/mojom/network_context.mojom   |  2 ++
+ .../network/public/mojom/network_context.mojom   |  3 +++
 .../core/frame/csp/content_security_policy.cc    |  3 +++
 .../blink/renderer/core/frame/local_frame.cc     |  3 +++
- .../blink/renderer/core/frame/local_frame.h      |  4 +++-
+ .../blink/renderer/core/frame/local_frame.h      |  3 +++
 .../renderer/core/frame/reporting_context.cc     |  9 +++++++++
 .../renderer/core/frame/reporting_context.h      |  7 +++++--
 .../renderer/core/frame/reporting_observer.cc    |  3 +--
- 20 files changed, 58 insertions(+), 25 deletions(-)
+ 22 files changed, 64 insertions(+), 25 deletions(-)
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc

 diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
@@ -41,15 +43,15 @@ 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
-@@ -1417,6 +1417,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1516,6 +1516,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
   }
 }
 
 +#if BUILDFLAG(ENABLE_REPORTING)
 std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
   std::vector<GURL> urls;
-   frame_host->ForEachRenderFrameHostWithAction(
-@@ -1430,6 +1431,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+   frame_host->ForEachRenderFrameHostImplWithAction(
+@@ -1529,6 +1530,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
       });
   return urls;
 }
@@ -82,22 +84,64 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
         kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
   }
 +#if BUILDFLAG(ENABLE_REPORTING)
-+  const absl::optional<std::string>& endpoint =
+  const std::optional<std::string>& endpoint =
 +      report_only ? report_only_endpoint_ : endpoint_;
   if (endpoint) {
     base::Value::Dict body_to_pass;
     for (const auto& pair : body) {
-@@ -126,6 +128,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-           /*user_agent=*/std::nullopt, std::move(body_to_pass));
+@@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+           network_anonymization_key_, std::move(body_to_pass));
     }
   }
 +#endif
 }
 
 }  // namespace content
-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
+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"
+@@ -240,12 +241,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_,
+         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
+@@ -16185,12 +16185,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+       }
+     }
+   }
+-
+-  // Send the crash report to the Reporting API.
+-  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
+-      /*type=*/"crash", crash_reporting_group_, last_committed_url_,
+-      GetReportingSource(), isolation_info_.network_anonymization_key(),
+-      std::move(body));
+ }
+ 
+ void RenderFrameHostImpl::UpdateOrDisableCompositorMetricRecorder() const {
+diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
+++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
@@ -18,25 +18,17 @@
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "services/network/public/mojom/source_location.mojom.h"
@@ -133,15 +177,15 @@ diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/co
 std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
   switch (coop_value) {
     case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone:
-@@ -62,6 +55,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
-       return "restrict-properties-plus-coep";
+@@ -59,6 +52,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
+       return "noopener-allow-popups";
   }
 }
 +#endif
 
 FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
   FrameTreeNode* opener =
-@@ -233,6 +227,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -230,6 +224,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
     network::mojom::SourceLocationPtr source_location,
     const std::string& reported_window_url,
     const std::string& initial_popup_url) const {
@@ -149,10 +193,10 @@ diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/co
   // Cross-Origin-Opener-Policy-Report-Only is not required to provide
   // endpoints.
   if (!coop_.report_only_reporting_endpoint)
-@@ -280,12 +275,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -277,12 +272,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
   storage_partition_->GetNetworkContext()->QueueReport(
       "coop", endpoint, context_url_, reporting_source_,
-       network_anonymization_key_, std::nullopt, std::move(body));
+       network_anonymization_key_, std::move(body));
 +#endif
 }
 
@@ -164,68 +208,51 @@ diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/co
   body.Set(kDisposition,
            is_report_only ? kDispositionReporting : kDispositionEnforce);
   body.Set(kEffectivePolicy,
-@@ -294,6 +291,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+@@ -290,6 +287,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+   storage_partition_->GetNetworkContext()->QueueReport(
       "coop", endpoint, context_url_, reporting_source_,
-       network_anonymization_key_,
-       /*user_agent=*/std::nullopt, std::move(body));
+       network_anonymization_key_, std::move(body));
 +#endif
 }
 
 }  // 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"
+diff --git a/content/browser/security/dip/document_isolation_policy_reporter.cc b/content/browser/security/dip/document_isolation_policy_reporter.cc
+--- a/content/browser/security/dip/document_isolation_policy_reporter.cc
+++ b/content/browser/security/dip/document_isolation_policy_reporter.cc
+@@ -7,6 +7,7 @@
+ #include <string_view>
+ 
 #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) {
+#include "net/net_buildflags.h"
+ #include "content/public/browser/storage_partition.h"
+ #include "services/network/public/cpp/request_destination.h"
+ #include "services/network/public/mojom/network_context.mojom.h"
+@@ -94,11 +95,13 @@ void DocumentIsolationPolicyReporter::QueueAndNotify(
+     }
+     body_to_pass.Set("disposition", disposition);
+ 
 +#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));
+     if (auto* storage_partition = storage_partition_.get()) {
+       storage_partition->GetNetworkContext()->QueueReport(
+           kType, *endpoint, context_url_, reporting_source_,
+           network_anonymization_key_, std::move(body_to_pass));
+     }
 +#endif
   }
- 
-   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
-@@ -14056,12 +14056,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/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
-@@ -128,6 +128,7 @@ void ReportResult(
-     int frame_tree_node_id,
+@@ -127,6 +127,7 @@ void ReportResult(
+     FrameTreeNodeId frame_tree_node_id,
     network::mojom::SignedExchangeReportPtr report,
     const net::NetworkAnonymizationKey& network_anonymization_key) {
 +#if BUILDFLAG(ENABLE_REPORTING)
   FrameTreeNode* frame_tree_node =
       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
   if (!frame_tree_node)
-@@ -142,6 +143,7 @@ void ReportResult(
+@@ -141,6 +142,7 @@ void ReportResult(
   DCHECK(partition);
   partition->GetNetworkContext()->QueueSignedExchangeReport(
       std::move(report), network_anonymization_key);
@@ -251,24 +278,24 @@ new file mode 100644
@@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kNetworkErrorLogging);
 +SET_CROMITE_FEATURE_DISABLED(kReporting);
-diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -222,6 +222,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
-     base::Seconds(30));
- 
- #if BUILDFLAG(ENABLE_REPORTING)
-+#error Attempting to build with enable_reporting
- BASE_FEATURE(kDocumentReporting,
-              "DocumentReporting",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
+--- a/net/reporting/reporting_header_parser.cc
+++ b/net/reporting/reporting_header_parser.cc
+@@ -344,6 +344,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
+     const NetworkAnonymizationKey& network_anonymization_key,
+     const url::Origin& origin,
+     base::flat_map<std::string, std::string> header) {
+  CHECK(false);
+   DCHECK(GURL::SchemeIsCryptographic(origin.scheme()));
+   DCHECK(!reporting_source.is_empty());
+   DCHECK(network_anonymization_key.IsEmpty() ||
 diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
 --- a/net/reporting/reporting_service.cc
 +++ b/net/reporting/reporting_service.cc
-@@ -214,6 +214,12 @@ class ReportingServiceImpl : public ReportingService {
-       base::Value::Dict body,
+@@ -236,6 +236,12 @@ class ReportingServiceImpl : public ReportingService {
       int depth,
-       base::TimeTicks queued_ticks) {
+       base::TimeTicks queued_ticks,
+       ReportingTargetType target_type) {
 +#if BUILDFLAG(ENABLE_REPORTING)
 +    if ((true))
 +      return;
@@ -281,12 +308,17 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -464,10 +464,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -501,14 +501,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+       const GURL& url,
       const std::optional<base::UnguessableToken>& reporting_source,
       const net::NetworkAnonymizationKey& network_anonymization_key,
-       const std::optional<std::string>& user_agent,
 -      base::Value::Dict body) override;
 +      base::Value::Dict body);
+   void QueueEnterpriseReport(const std::string& type,
+                              const std::string& group,
+                              const GURL& url,
+-                             base::Value::Dict body) override;
+                             base::Value::Dict body);
   void QueueSignedExchangeReport(
       mojom::SignedExchangeReportPtr report,
 -      const net::NetworkAnonymizationKey& network_anonymization_key) override;
@@ -294,10 +326,21 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
   void AddDomainReliabilityContextForTesting(
       const url::Origin& origin,
       const GURL& upload_url,
+diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/public/cpp/parsed_headers.cc
+--- a/services/network/public/cpp/parsed_headers.cc
+++ b/services/network/public/cpp/parsed_headers.cc
+@@ -125,6 +125,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+   }
+ 
+ #if BUILDFLAG(ENABLE_REPORTING)
+#error Attempting to build with enable_reporting
+   if (std::optional<std::string> reporting_endpoints =
+           headers->GetNormalizedHeader("Reporting-Endpoints")) {
+     parsed_headers->reporting_endpoints =
 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
-@@ -1467,7 +1467,6 @@ mojom("mojom") {
+@@ -1793,7 +1793,6 @@ mojom("mojom") {
     export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
     export_header_blink = "third_party/blink/public/platform/web_common.h"
     if (enable_reporting) {
@@ -308,18 +351,26 @@ 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
-@@ -1221,6 +1221,7 @@ interface NetworkContext {
-   // provided |network_isolation_key|.
+@@ -1264,6 +1264,7 @@ interface NetworkContext {
+   // provided `network_anonymization_key`.
   //
   // Spec: https://w3c.github.io/reporting/#concept-reports
 +  [EnableIf=enable_reporting]
   QueueReport(string type,
               string group,
               url.mojom.Url url,
-@@ -1234,6 +1235,7 @@ interface NetworkContext {
+@@ -1271,6 +1272,7 @@ interface NetworkContext {
+               NetworkAnonymizationKey network_anonymization_key,
+               mojo_base.mojom.DictionaryValue body);
+ 
+  [EnableIf=enable_reporting]
+   QueueEnterpriseReport(string type,
+                         string group,
+                         url.mojom.Url url,
+@@ -1281,6 +1283,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|.
+   // `network_anonymization_key`.
 +  [EnableIf=enable_reporting]
   QueueSignedExchangeReport(SignedExchangeReport report,
                             NetworkAnonymizationKey network_anonymization_key);
@@ -327,23 +378,23 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
 diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 --- a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 +++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
-@@ -29,6 +29,7 @@
- #include <optional>
+@@ -31,6 +31,7 @@
+ #include <set>
 #include <utility>
 
 +#include "net/net_buildflags.h"
 #include "base/containers/contains.h"
 #include "base/debug/dump_without_crashing.h"
- #include "base/ranges/algorithm.h"
-@@ -1215,6 +1216,7 @@ void ContentSecurityPolicy::ReportViolation(
+ #include "base/feature_list.h"
+@@ -1356,6 +1357,7 @@ void ContentSecurityPolicy::ReportViolation(
+       ShouldBypassContentSecurityPolicy(KURL(violation_data->sourceFile()))) {
     return;
   }
- 
 +#if BUILDFLAG(ENABLE_REPORTING)
   PostViolationReport(violation_data, context_frame, report_endpoints,
                       use_reporting_api);
 
-@@ -1222,6 +1224,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1363,6 +1365,7 @@ void ContentSecurityPolicy::ReportViolation(
   // `context_frame` (i.e. we're not processing 'frame-ancestors').
   if (delegate_ && !context_frame)
     delegate_->DispatchViolationEvent(*violation_data, element);
@@ -354,7 +405,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -45,6 +45,7 @@
+@@ -48,6 +48,7 @@
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "mojo/public/cpp/system/message_pipe.h"
@@ -362,8 +413,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"
-@@ -2670,9 +2671,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
-   v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
+@@ -2860,9 +2861,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+   return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
 }
 
 +#if BUILDFLAG(ENABLE_REPORTING)
@@ -377,19 +428,18 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
 --- a/third_party/blink/renderer/core/frame/local_frame.h
 +++ b/third_party/blink/renderer/core/frame/local_frame.h
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
 #include "base/time/time.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
 +#include "net/net_buildflags.h"
 #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
-   void FinishedScrollSequence();
+ #include "net/storage_access_api/status.h"
+@@ -671,7 +672,9 @@ class CORE_EXPORT LocalFrame final
+     return client_hints_preferences_;
+   }
 
-   SmoothScrollSequencer* GetSmoothScrollSequencer() const;
-
 +#if BUILDFLAG(ENABLE_REPORTING)
   mojom::blink::ReportingServiceProxy* GetReportingService();
 +#endif
@@ -404,30 +454,30 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 #include "third_party/blink/renderer/core/frame/reporting_context.h"
 
 +#include "net/net_buildflags.h"
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+ #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
-@@ -53,7 +54,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
+@@ -59,7 +60,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
 ReportingContext::ReportingContext(ExecutionContext& context)
     : Supplement<ExecutionContext>(context),
       execution_context_(context),
 +#if BUILDFLAG(ENABLE_REPORTING)
       reporting_service_(&context),
 +#endif
-       receiver_(this, &context) {}
+       receivers_(this, &context) {}
 
 // static
-@@ -117,7 +120,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
+@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
   visitor->Trace(observers_);
   visitor->Trace(report_buffer_);
   visitor->Trace(execution_context_);
 +#if BUILDFLAG(ENABLE_REPORTING)
   visitor->Trace(reporting_service_);
 +#endif
-   visitor->Trace(receiver_);
+   visitor->Trace(receivers_);
   Supplement<ExecutionContext>::Trace(visitor);
 }
-@@ -139,6 +144,7 @@ void ReportingContext::CountReport(Report* report) {
+@@ -149,6 +154,7 @@ void ReportingContext::CountReport(Report* report) {
   UseCounter::Count(execution_context_, feature);
 }
 
@@ -435,23 +485,23 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
 ReportingContext::GetReportingService() const {
   if (!reporting_service_.is_bound()) {
-@@ -148,6 +154,7 @@ ReportingContext::GetReportingService() const {
+@@ -158,6 +164,7 @@ ReportingContext::GetReportingService() const {
   }
   return reporting_service_;
 }
 +#endif
 
 void ReportingContext::NotifyInternal(Report* report) {
-   // Buffer the report.
-@@ -170,6 +177,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+   if (!ShouldReportBeVisibleToObservers(report)) {
+@@ -184,6 +191,7 @@ void ReportingContext::NotifyInternal(Report* report) {
 
 void ReportingContext::SendToReportingAPI(Report* report,
                                           const String& endpoint) const {
 +#if BUILDFLAG(ENABLE_REPORTING)
   const String& type = report->type();
-   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
-         type == ReportType::kPermissionsPolicyViolation ||
-@@ -227,6 +235,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+   if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
+         type == ReportType::kDeprecation ||
+@@ -263,6 +271,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
         url, endpoint, body->featureId(), body->disposition(), body->message(),
         body->sourceFile(), line_number, column_number);
   }
@@ -470,7 +520,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
 #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
 #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
 #include "third_party/blink/renderer/core/core_export.h"
-@@ -55,10 +56,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -56,10 +57,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
  private:
   // Counts the use of a report type via UseCounter.
   void CountReport(Report*);
@@ -483,7 +533,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
   void NotifyInternal(Report* report);
   // Send |report| via the Reporting API to |endpoint|.
   void SendToReportingAPI(Report* report, const String& endpoint) const;
-@@ -69,8 +70,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -71,8 +72,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
 
   // This is declared mutable so that the service endpoint can be cached by
   // const methods.
@@ -492,12 +542,12 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
       reporting_service_;
 +#endif
 
-   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
- };
+   // There might be up to two ReportingObservers stored here: one that is called
+   // from the CrossOriginEmbedderPolicyReporter and one that is called from the
 diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third_party/blink/renderer/core/frame/reporting_observer.cc
 --- a/third_party/blink/renderer/core/frame/reporting_observer.cc
 +++ b/third_party/blink/renderer/core/frame/reporting_observer.cc
-@@ -62,8 +62,7 @@ void ReportingObserver::QueueReport(Report* report) {
+@@ -61,8 +61,7 @@ void ReportingObserver::QueueReport(Report* report) {
 }
 
 bool ReportingObserver::ObservedType(const String& type) {
@@ -4,83 +4,80 @@ 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 |  5 -----
- .../browser/supervised_user_pref_store.cc     |  1 +
- .../browser/supervised_user_preferences.cc    |  6 +++++-
- .../core/browser/supervised_user_service.cc   |  1 +
- .../core/browser/supervised_user_utils.cc     |  1 +
- .../supervised_user/core/common/features.cc   |  6 ++++++
- 14 files changed, 18 insertions(+), 43 deletions(-)
+ chrome/android/BUILD.gn                                    | 1 -
+ .../chrome/browser/feedback/ChromeFeedbackCollector.java   | 1 -
+ chrome/browser/feedback/android/BUILD.gn                   | 2 --
+ chrome/browser/prefs/chrome_pref_service_factory.cc        | 2 +-
+ chrome/browser/profiles/profile_attributes_entry.cc        | 2 +-
+ chrome/browser/profiles/profile_impl.cc                    | 5 +----
+ chrome/browser/profiles/profile_manager.cc                 | 7 -------
+ .../supervised_user/supervised_user_browser_utils.cc       | 1 +
+ chrome/browser/ui/webui/managed_ui_handler.cc              | 4 ----
+ .../browser/ui/webui/management/management_ui_handler.cc   | 4 ----
+ .../core/browser/supervised_user_pref_store.cc             | 1 +
+ .../core/browser/supervised_user_preferences.cc            | 6 +++++-
+ .../core/browser/supervised_user_service.cc                | 1 +
+ components/supervised_user/core/common/features.cc         | 2 +-
+ extensions/browser/api/management/management_api.cc        | 1 +
+ 15 files changed, 13 insertions(+), 27 deletions(-)

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -749,7 +749,6 @@ if (current_toolchain == default_toolchain) {
-       "//components/dom_distiller/core:distiller_type_java",
-       "//components/ntp_tiles:ntp_tiles_enums_java",
+@@ -820,7 +820,6 @@ if (_is_default_toolchain) {
       "//components/offline_pages/core:offline_page_model_enums_java",
+       "//components/sharing_message:sharing_dialog_type_generated_enum",
+       "//components/sharing_message:sharing_send_message_result_generated_enum",
 -      "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
-       "//net:effective_connection_type_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
-@@ -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;
-import org.chromium.components.supervised_user.SupervisedUserPreferences;
- import org.chromium.components.user_prefs.UserPrefs;
- import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
- import org.chromium.ui.base.DeviceFormFactor;
-@@ -753,9 +752,7 @@ public class FeedSurfaceCoordinator
-      * Returns true if the supervised user feed should be displayed.
-      */
-     public boolean shouldDisplaySupervisedFeed() {
-        PrefService prefService = UserPrefs.get(mProfile);
-        return SupervisedUserPreferences.isSubjectToParentalControls(prefService)
-                && ChromeFeatureList.isEnabled(ChromeFeatureList.KID_FRIENDLY_CONTENT_FEED);
-+        return false;
-     }
+     # From java_sources.gni.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
+@@ -95,7 +95,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
+         // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
+         // incognito profile.
+         if (!initParams.profile.isOffTheRecord()) {
+-            sources.add(new FamilyInfoFeedbackSource(initParams.profile));
+         }
 
-     /**
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -3237,8 +3237,6 @@ static_library("browser") {
-       "feed/android/refresh_task_scheduler_impl.cc",
-       "feed/android/refresh_task_scheduler_impl.h",
-       "feed/android/web_feed_bridge.cc",
-      "feedback/android/family_info_feedback_source.cc",
-      "feedback/android/family_info_feedback_source.h",
-       "file_select_helper_contacts_android.cc",
-       "file_select_helper_contacts_android.h",
-       "first_run/android/first_run_prefs.cc",
+         return sources;
+diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/android/BUILD.gn
+--- a/chrome/browser/feedback/android/BUILD.gn
+++ b/chrome/browser/feedback/android/BUILD.gn
+@@ -8,7 +8,6 @@ import("//third_party/jni_zero/jni_zero.gni")
+ 
+ generate_jni("jni_headers") {
+   sources = [
+-    "java/src/org/chromium/chrome/browser/feedback/FamilyInfoFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/ProcessIdFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java",
+   ]
+@@ -56,7 +55,6 @@ android_library("java") {
+     "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java",
+     "java/src/org/chromium/chrome/browser/feedback/DeviceInfoFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/FallbackHelpAndFeedbackLauncherDelegate.java",
+-    "java/src/org/chromium/chrome/browser/feedback/FamilyInfoFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncher.java",
+     "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java",
 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
-@@ -317,7 +317,7 @@ void PrepareFactory(
+@@ -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) {
+     // supervised_user_prefs handles the case when content_filters_service is
+     // nullptr. It's simply not subscribing to empty service's notifications.
     scoped_refptr<PrefStore> supervised_user_prefs =
-         base::MakeRefCounted<SupervisedUserPrefStore>(supervised_user_settings);
-     DCHECK(async || supervised_user_prefs->IsInitializationComplete());
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -422,7 +422,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -476,7 +476,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
 }
 
 std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -92,7 +89,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -690,10 +690,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -683,10 +683,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
     prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
 
   pref_change_registrar_.Init(prefs);
@@ -103,7 +100,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 
   // Changes in the profile avatar.
   pref_change_registrar_.Add(
-@@ -1631,6 +1627,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1623,6 +1619,7 @@ GURL ProfileImpl::GetHomePage() {
 }
 
 void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -114,40 +111,38 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1214,23 +1214,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1190,10 +1190,6 @@ 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)) {
+-  if (!profile->GetPrefs()->HasPrefPath(prefs::kSupervisedUserId)) {
 -    profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
 -                                   supervised_user_id);
 -  }
- #if !BUILDFLAG(IS_ANDROID)
-   if (profile->IsNewProfile()) {
-     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
-@@ -2038,9 +2021,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+ }
+ 
+ void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
+@@ -1955,9 +1951,6 @@ 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(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
   user_manager::User* user =
       ash::ProfileHelper::Get()->GetUserByProfile(profile);
+diff --git a/chrome/browser/supervised_user/supervised_user_browser_utils.cc b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+--- a/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+++ b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+@@ -99,6 +99,7 @@ bool SupervisedUserCanSkipExtensionParentApprovals(const Profile* profile) {
+ }
+ 
+ bool AreExtensionsPermissionsEnabled(Profile* profile) {
+  if ((true)) return false;
+ #if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
+   return profile->IsChild();
+ #else
 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
@@ -165,22 +160,21 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -1496,11 +1496,6 @@ void ManagementUIHandler::AddObservers() {
- 
-   pref_registrar_.Init(profile->GetPrefs());
+@@ -623,10 +623,6 @@ bool ManagementUIHandler::managed() const {
 
+ void ManagementUIHandler::RegisterPrefChange(
+     PrefChangeRegistrar& pref_registrar) {
 -  pref_registrar_.Add(
 -      prefs::kSupervisedUserId,
 -      base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
 -                          base::Unretained(this)));
-
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   pref_registrar_.Add(
-       plugin_vm::prefs::kPluginVmDataCollectionAllowed,
+ }
+ 
+ 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() {}
+@@ -172,6 +172,7 @@ void SupervisedUserPrefStore::OnNewContentFiltersStateAvailable(
 
 void SupervisedUserPrefStore::OnNewSettingsAvailable(
     const base::Value::Dict& settings) {
@@ -191,7 +185,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.
 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
-@@ -162,6 +162,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -160,6 +160,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
 }
 
 void EnableParentalControls(PrefService& pref_service) {
@@ -201,8 +195,8 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 +  }
   pref_service.SetString(prefs::kSupervisedUserId,
                          supervised_user::kChildAccountSUID);
-   SetIsChildAccountStatusKnown(pref_service);
-@@ -184,7 +188,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
+ #if BUILDFLAG(IS_CHROMEOS)
+@@ -187,7 +191,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
 }
 
 bool IsSubjectToParentalControls(const PrefService& pref_service) {
@@ -210,41 +204,44 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 +  return false;
 }
 
- bool AreExtensionsPermissionsEnabled(const PrefService& pref_service) {
+ bool IsGoogleSafeSearchEnforced(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
-@@ -189,6 +189,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState(
+@@ -248,6 +248,7 @@ SupervisedUserService::SupervisedUserService(
 }
 
- void SupervisedUserService::SetActive(bool active) {
+ void SupervisedUserService::SetSettingsServiceActive(bool active) {
 +  active = false;
-   if (active_ == active) {
-     return;
-   }
-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
-@@ -99,6 +99,7 @@ GURL NormalizeUrl(const GURL& url) {
- }
+   settings_service_->SetActive(active);
 
- bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
-+  if ((true)) return true;
-   return pref_service
-              .FindPreference(prefs::kDefaultSupervisedUserFilteringBehavior)
-              ->IsDefaultValue() ||
+   // Trigger a sync reconfig to enable/disable the right SU data types.
 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
-@@ -122,4 +122,10 @@ bool IsShadowKidsApiWithSafeSitesEnabled() {
-   return base::FeatureList::IsEnabled(kShadowKidsApiWithSafeSites);
+@@ -33,7 +33,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+-
+ #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+     BUILDFLAG(IS_WIN)
+ const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
+@@ -164,4 +163,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
+ 
+ #endif
+ 
+SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
+ }  // namespace supervised_user
+diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
+--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
+@@ -312,6 +312,7 @@ void AddExtensionInfo(const Extension* source_extension,
 }
 
-+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
-+
- }  // namespace supervised_user
+ bool PlatformSupportsApprovalFlowForExtensions() {
+  if ((true)) return false;
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+     BUILDFLAG(IS_WIN)
+   return true;
 --
@@ -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
-@@ -1197,6 +1197,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1330,6 +1330,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -22,11 +22,11 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +}
 +
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
+     std::optional<WebMediaPlayer::TrackId> enabled_track_id) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3541,7 +3547,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
-           : HasAudio();
+@@ -3679,7 +3685,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
 
+   const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured();
   // Audio only stream is allowed to play when in background.
 -  if (!HasVideo() && preserve_audio)
 +  //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
@@ -35,7 +35,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +  if (!HasVideoNonEmptySize() && preserve_audio)
     return false;
 
-   // MediaPlayer always signals audio and video, so use an empty natural size to
+   // Video PiP is the only exception when background video playback is disabled.
 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
@@ -47,6 +47,6 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b
 +  bool HasVideoNonEmptySize() const;
 +
   void EnabledAudioTracksChanged(
-       const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
+       std::optional<WebMediaPlayer::TrackId> enabled_track_id) override;
   void SelectedVideoTrackChanged(
 --
@@ -3,6 +3,8 @@ Date: Mon, 13 Nov 2023 14:26:00 +0000
 Subject: Always allow inspect fallback

 Always enable 'inspect fallback' in 'chrome://inspect/#devices'
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/browser/resources/inspect/inspect.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -10,7 +12,7 @@ Always enable 'inspect fallback' in 'chrome://inspect/#devices'
 diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resources/inspect/inspect.js
 --- a/chrome/browser/resources/inspect/inspect.js
 +++ b/chrome/browser/resources/inspect/inspect.js
-@@ -50,6 +50,7 @@ if ('browser-inspector' in queryParamsObject) {
+@@ -45,6 +45,7 @@ if ('browser-inspector' in queryParamsObject) {
 })();
 
 function isVersionNewerThanHost(version) {
@@ -18,7 +20,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resour
   if (!HOST_CHROME_VERSION) {
     return false;
   }
-@@ -561,7 +562,7 @@ function formatValue(data, property) {
+@@ -590,7 +591,7 @@ function formatValue(data, property) {
 function addFavicon(row, data) {
   const favicon = document.createElement('img');
   if (data['faviconUrl']) {
@@ -1,7 +1,8 @@
-From: Your Name <you@example.com>
+From: uazo <uazo@users.noreply.github.com>
 Date: Wed, 28 Dec 2022 07:19:58 +0000
 Subject: Always open browser controls in new tab

+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../chrome/browser/tab/TabContextMenuItemDelegate.java        | 4 ++++
 1 file changed, 4 insertions(+)
@@ -9,34 +10,34 @@ Subject: Always open browser controls in new tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -21,6 +21,7 @@ import org.chromium.base.IntentUtils;
- import org.chromium.base.PackageManagerUtils;
+@@ -23,6 +23,7 @@ import org.chromium.base.PackageManagerUtils;
 import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.cc.input.BrowserControlsState;
 import org.chromium.chrome.browser.DefaultBrowserInfo;
 import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -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.bookmarks.BookmarkManagerOpenerImpl;
+@@ -42,6 +43,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
+ import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-@@ -219,6 +221,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
-             Referrer referrer,
+@@ -304,6 +306,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+             @Nullable Referrer referrer,
             boolean navigateToTab,
             @Nullable AdditionalNavigationParams additionalNavigationParams) {
 +        TabBrowserControlsConstraintsHelper.get(mTab).update(BrowserControlsState.SHOWN, true);
         RecordUserAction.record("MobileNewTabOpened");
         RecordUserAction.record("LinkOpenedInNewTab");
         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-@@ -235,6 +238,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
- 
-     @Override
-     public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
+@@ -324,6 +327,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+      * @param url The URL to open.
+      */
+     public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) {
 +        TabBrowserControlsConstraintsHelper.get(mTab).update(BrowserControlsState.SHOWN, true);
         RecordUserAction.record("MobileNewTabOpened");
         RecordUserAction.record("LinkOpenedInNewTab");
@@ -7,31 +7,56 @@ Ignore any partner-provided home page.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ----
+ .../chrome/browser/new_tab_url/DseNewTabUrlManager.java       | 2 +-
+ .../partnerbookmarks/PartnerBookmarksProviderIterator.java    | 1 +
 .../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(-)
+ .../always-use-new-tab-page-for-default-home-page.inc         | 1 +
+ 7 files changed, 6 insertions(+), 6 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
-@@ -152,10 +152,6 @@ public class HomepageManager
-      *         tab page if the homepage button is force enabled via flag.
+@@ -159,10 +159,6 @@ public class HomepageManager
+      *     tab page if the homepage button is force enabled via flag.
      */
-     public static GURL getDefaultHomepageGurl() {
+     public GURL getDefaultHomepageGurl() {
 -        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
-            return PartnerBrowserCustomizations.getInstance().getHomePageUrl();
+-            return assumeNonNull(PartnerBrowserCustomizations.getInstance().getHomePageUrl());
 -        }
 -
         String homepagePartnerDefaultGurlSerialized =
                 ChromeSharedPreferences.getInstance()
                         .readString(
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
+@@ -59,7 +59,7 @@ public class DseNewTabUrlManager {
+ 
+     /** Returns whether the feature NewTabSearchEngineUrlAndroid is enabled. */
+     public static boolean isNewTabSearchEngineUrlAndroidEnabled() {
+-        return true;
+        return false;
+     }
+ 
+     /**
+diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
+--- a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
+++ b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
+@@ -70,6 +70,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
+         new AsyncTask<@Nullable Cursor>() {
+             @Override
+             protected @Nullable Cursor doInBackground() {
+                if ((true)) return null;
+                 try {
+                     return ContextUtils.getApplicationContext()
+                             .getContentResolver()
 diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -212,7 +212,7 @@ public class PartnerBrowserCustomizations {
+@@ -213,7 +213,7 @@ public class PartnerBrowserCustomizations {
                                                             & ApplicationInfo.FLAG_SYSTEM)
                                                     == 1
                                             || !VersionInfo.isStableBuild();
@@ -43,7 +68,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -69,6 +69,7 @@ public class TemplateUrl {
+@@ -88,6 +88,7 @@ public class TemplateUrl {
      *     prepopulated_engines.json.
      */
     public String getNewTabURL() {
@@ -54,19 +79,18 @@ 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
-@@ -330,6 +330,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -400,6 +400,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+         jimage_translate_source_language_param_key,
     const base::android::JavaParamRef<jstring>&
-         jimage_translate_target_language_param_key,
-     jboolean set_as_default) {
+         jimage_translate_target_language_param_key) {
 +  if ((true)) return false;
-   // Check if there is already a search engine created from Play API.
-   TemplateURLService::TemplateURLVector template_urls =
-       template_url_service_->GetTemplateURLs();
+   // The function is scheduled to run only when the service is loaded, see
+   // `TemplateUrlService#runWhenLoaded()`.
+   CHECK(template_url_service_->loaded());
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
 new file mode 100755
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
-@@ -0,0 +1,2 @@
-+SET_CROMITE_FEATURE_DISABLED(kNewTabSearchEngineUrlAndroid);
+@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kPartnerCustomizationsUma);
 --
@@ -7,13 +7,35 @@ 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
 ---
+ ...rowserStateBrowserControlsVisibilityDelegate.java |  4 +++-
 .../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(+)
+ 4 files changed, 30 insertions(+), 1 deletion(-)
 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/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
+--- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
+++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
+@@ -41,6 +41,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+     private final Supplier<Boolean> mPersistentFullscreenMode;
+ 
+     private long mCurrentShowingStartTime;
+    private int temporaryToken;
+ 
+     /**
+      * Constructs a BrowserControlsVisibilityDelegate designed to deal with overrides driven by
+@@ -66,7 +67,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+         long currentShowingTime = SystemClock.uptimeMillis() - mCurrentShowingStartTime;
+         if (currentShowingTime >= MINIMUM_SHOW_DURATION_MS) return;
+ 
+-        final int temporaryToken = mTokenHolder.acquireToken();
+        mTokenHolder.releaseToken(temporaryToken);
+        temporaryToken = mTokenHolder.acquireToken();
+         mHandler.postDelayed(
+                 () -> mTokenHolder.releaseToken(temporaryToken),
+                 MINIMUM_SHOW_DURATION_MS - currentShowingTime);
 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
@@ -31,7 +53,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -73,6 +73,12 @@ found in the LICENSE file.
+@@ -79,6 +79,12 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -0,0 +1,807 @@
+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
+---
+ .../java/res/xml/homepage_preferences.xml     |   6 +
+ .../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/tabwindow/TabWindowManager.java   |   2 +
+ .../tabwindow/TabWindowManagerImpl.java       |  10 ++
+ .../Ask-for-restart-on-connection-change.grdp |  15 +++
+ .../java/res/layout/floating_snackbar.xml     |  10 ++
+ .../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 +-
+ 30 files changed, 332 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/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
+--- a/chrome/android/java/res/xml/homepage_preferences.xml
+++ b/chrome/android/java/res/xml/homepage_preferences.xml
+@@ -25,6 +25,12 @@ found in the LICENSE file.
+         app:featureName="enable-show-ntp-at-startup"
+         app:needRestart="true" />
+ 
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:title="@string/ask_to_restart_on_connection_change_title"
+        android:summary="@string/ask_to_restart_on_connection_change_summary"
+        app:featureName="ask-for-restart-on-connection-change"
+        app:needRestart="true" />
+
+     <org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
+         android:key="homepage_radio_group"
+         android:selectable="false"
+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
+@@ -470,7 +470,6 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
+     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+     public void setConnectionState(@ConnectionState int connectionState) {
+         Log.i(TAG, "setConnectionState connectionState=" + connectionState);
+-        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
+@@ -22,10 +22,31 @@ import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+ import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
+-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.tabwindow.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.hub.HubLayout;
+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.tabwindow.TabWindowManager;
+import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
+import org.chromium.content_public.browser.WebContentsObserver;
+import org.chromium.content_public.browser.WebContents;
+import org.chromium.net.NetworkChangeNotifier;
+
+ import java.util.function.Supplier;
+ 
+ /**
+@@ -34,7 +55,8 @@ import java.util.function.Supplier;
+  */
+ @NullMarked
+ 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
+@@ -120,6 +142,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
+@@ -131,7 +158,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;
+@@ -235,6 +268,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) {
+                            observe(null);
+                            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)
+                .setDefaultLines(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 HubLayout)) {
+            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
+            snackbarManager.dismissSnackbars(this);
+        }
+    }
+
+     private void logToAdbConsoleNow(String prefix) {
+         Log.i(
+                 TAG,
+@@ -321,6 +423,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
+@@ -31,6 +31,11 @@ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ import java.util.function.Supplier;
+ 
+import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.chrome.browser.layouts.LayoutManager;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+
+ /**
+  * Class that controls visibility and content of {@link StatusIndicatorCoordinator} to relay
+  * connectivity information.
+@@ -104,7 +109,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 "force online connection state" switch is set, the offline indicator should never
+         // show.
+         assert !CommandLine.getInstance()
+@@ -130,7 +138,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
+@@ -1439,7 +1439,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+                             mActivity,
+                             mStatusIndicatorCoordinator,
+                             isUrlBarFocusedSupplier,
+-                            mCanAnimateBrowserControls);
+                            mCanAnimateBrowserControls,
+                            mTabModelSelectorSupplier,
+                            mLayoutManagerSupplier,
+                            mSnackbarManagerSupplier);
+         }
+ 
+         if (mToolbarManager.getOmniboxStub() != null) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+@@ -199,6 +199,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 TabModel getCurrentModel() {
+         if (mTabModelInternals.size() == 0) return EmptyTabModel.getInstance(false);
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
+new file mode 100644
+--- /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.components.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
+@@ -146,6 +146,8 @@ public interface TabModelSelector {
+     /** Get total tab count across all tab models */
+     int getTotalTabCount();
+ 
+    void setPagesFrozen(boolean frozen);
+
+     /**
+      * Search all TabModels for a tab with the specified id.
+      *
+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
+@@ -15,6 +15,7 @@ import org.chromium.build.annotations.Nullable;
+ 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;
+@@ -22,6 +23,9 @@ import java.util.Collection;
+ import java.util.List;
+ import java.util.function.Predicate;
+ import java.util.function.Supplier;
+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.
+@@ -54,6 +58,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} index whose URL matches the specified URL.
+      *
+diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
+--- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
+++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
+@@ -135,6 +135,8 @@ public interface TabWindowManager {
+     /** Returns the total number of incognito tabs across all tab model selectors. */
+     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/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
+--- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
+++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
+@@ -551,6 +551,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+         return tabGroupModelFilter.getTabsInGroup(tabGroupId);
+     }
+ 
+    @Override
+    public void setPagesFrozen(boolean frozen) {
+        for (int i : mWindowIdToSelectors.keySet()) {
+            TabModelSelector selector = mWindowIdToSelectors.get(i);
+            if (selector != null) {
+                selector.setPagesFrozen(frozen);
+            }
+        }
+    }
+
+     @Override
+     public @Nullable TabModelSelector getTabModelSelectorById(@WindowId int windowId) {
+         return mWindowIdToSelectors.get(windowId);
+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,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_ASK_TO_RESTART_ON_CONNECTION_CHANGE_TITLE" desc="Text for 'Ask to restart on connection change' settings option.">
+        Ask to restart on connection change
+    </message>
+    <message name="IDS_ASK_TO_RESTART_ON_CONNECTION_CHANGE_SUMMARY" desc="Summary text for 'Ask to restart on connection change' settings option.">
+        If the IP of the connection changes, access to the network is blocked and a browser restart is requested
+    </message>
+    <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/floating_snackbar.xml b/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+--- a/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+++ b/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+@@ -50,5 +50,15 @@ found in the LICENSE file.
+       android:paddingEnd="@dimen/snackbar_button_padding"
+       android:paddingStart="@dimen/snackbar_button_padding"
+       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>
+ 
+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="@dimen/snackbar_button_padding"
+             android:paddingStart="@dimen/snackbar_button_padding"
+             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
+@@ -136,6 +136,8 @@ public class Snackbar {
+     private @Nullable String mTemplateText;
+     private @Nullable String mActionText;
+     private @Nullable Object mActionData;
+    private String mDismissActionText;
+    private Object mDismissActionData;
+     private int mBackgroundColor;
+     private int mTextApperanceResId;
+     private boolean mDefaultLines = true;
+@@ -242,6 +244,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 appearance for the snackbar. If 0, the snackbar will use default text
+      * appearance.
+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
+@@ -326,6 +326,12 @@ public class SnackbarManager
+                         new SnackbarView(
+                                 mActivity,
+                                 this,
+                                new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        dismissSnackbars(currentSnackbar.getController());
+                                    }
+                                },
+                                 currentSnackbar,
+                                 mOriginalParentView,
+                                 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
+@@ -56,6 +56,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;
+@@ -102,11 +103,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);
+     }
+ 
+     /**
+@@ -125,6 +127,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+     public SnackbarView(
+             Activity activity,
+             OnClickListener listener,
+            OnClickListener dismissListener,
+             Snackbar snackbar,
+             ViewGroup parentView,
+             @Nullable WindowAndroid windowAndroid,
+@@ -155,6 +158,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;
+         if (SnackbarManager.isFloatingSnackbarEnabled()) {
+@@ -429,6 +434,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
+@@ -904,6 +904,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
+@@ -196,6 +196,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
+@@ -4076,8 +4076,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
+@@ -1138,6 +1138,12 @@ public class WebContentsImpl
+         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;
+@@ -1460,6 +1466,8 @@ public class WebContentsImpl
+ 
+         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
+@@ -288,6 +288,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
+@@ -188,6 +188,9 @@ public class MockWebContents implements WebContents, WebContentsObserver.Observa
+     @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_ENABLED_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
+@@ -4630,6 +4630,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
+@@ -3312,6 +3312,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() {
+@@ -3326,6 +3327,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
+@@ -989,7 +989,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
+@@ -237,10 +237,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
+   // it is desirable to reject the page freeze to prevent the scheduler from
+   // being put in a bad state. See https://crbug.com/873214 for context of how
+   // this can happen on the browser side.
+#if !BUILDFLAG(IS_ANDROID)
+   if (frozen && IsPageVisible()) {
+     DCHECK(false);
+     return;
+   }
+#endif
+   PolicyUpdater policy_updater;
+   SetPageFrozenImpl(frozen, policy_updater);
+ }
+@@ -815,7 +817,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+   // expire immediately when a page is backgrounded, which is undesirable in
+   // headless mode. To prevent that, a page is never considerer backgrounded
+   // when virtual time is enabled.
+-  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();
+ }
+ 
+--
@@ -15,8 +15,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../modules/webaudio/base_audio_context.cc         | 12 ++++++++++++
 .../renderer/modules/webaudio/base_audio_context.h |  2 ++
 .../modules/webaudio/offline_audio_context.cc      |  1 +
- .../renderer/modules/webaudio/realtime_analyser.cc |  7 +++++++
- 10 files changed, 54 insertions(+), 1 deletion(-)
+ .../renderer/modules/webaudio/realtime_analyser.cc | 13 ++++++++++---
+ .../platform/runtime_enabled_features.json5        |  5 ++---
+ 11 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc
@@ -51,7 +52,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
-@@ -196,6 +196,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
+@@ -200,6 +200,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
   }
 }
 
@@ -60,7 +61,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third
 +    if (NotShared<DOMFloat32Array> array = getChannelData(i)) {
 +      size_t len = array->length();
 +      if (len > 0) {
-+        float* destination = array->Data();
+        base::span<float> destination = array->AsSpan();
 +        for (unsigned j = 0; j < len; ++j) {
 +          destination[j] = BaseAudioContext::ShuffleAudioData(destination[j], j);
 +        }
@@ -75,7 +76,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
-@@ -115,6 +115,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
+@@ -116,6 +116,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
 
   std::unique_ptr<SharedAudioBuffer> CreateSharedAudioBuffer();
 
@@ -87,16 +88,16 @@ 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 @@
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+@@ -17,6 +17,7 @@
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/mediastream/media_devices.h"
+ #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
 +#include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 #include "third_party/blink/public/platform/web_audio_latency_hint.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-@@ -582,7 +583,9 @@ double AudioContext::baseLatency() const {
-   DCHECK(IsMainThread());
+@@ -850,7 +851,9 @@ double AudioContext::baseLatency() const {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
   DCHECK(destination());
 
 -  return base_latency_;
@@ -117,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
 #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
 #include "third_party/blink/public/platform/platform.h"
-@@ -721,6 +722,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -774,6 +775,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
   return To<LocalDOMWindow>(GetExecutionContext());
 }
 
@@ -138,19 +139,19 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
-@@ -337,6 +337,8 @@ class MODULES_EXPORT BaseAudioContext
+@@ -327,6 +327,8 @@ class MODULES_EXPORT BaseAudioContext
   // if the execution context does not exist.
   bool CheckExecutionContextAndThrowIfNecessary(ExceptionState&);
 
 +  static float ShuffleAudioData(float data, unsigned index);
 +
  protected:
-   enum ContextType { kRealtimeContext, kOfflineContext };
+   enum class ContextType { kRealtimeContext, kOfflineContext };
 
 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
-@@ -368,6 +368,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -374,6 +374,7 @@ void OfflineAudioContext::FireCompletionEvent() {
     if (!rendered_buffer) {
       return;
     }
@@ -161,46 +162,72 @@ diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.c
 diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
-@@ -31,6 +31,7 @@
- #include <bit>
+@@ -32,6 +32,7 @@
 #include <complex>
 
+ #include "base/compiler_specific.h"
 +#include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
 #include "third_party/blink/renderer/platform/audio/audio_bus.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/audio/vector_math.h"
-@@ -155,6 +156,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize];
- 
-+      value = BaseAudioContext::ShuffleAudioData(value, i);
-       destination[i] = value;
+@@ -117,7 +118,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
+     for (unsigned i = 0; i < len; ++i) {
+       const float linear_value = UNSAFE_TODO(source[i]);
+       const double db_mag = audio_utilities::LinearToDecibels(linear_value);
+-      UNSAFE_TODO(destination[i]) = static_cast<float>(db_mag);
+      auto v = static_cast<float>(db_mag);
+      UNSAFE_TODO(destination[i]) = BaseAudioContext::ShuffleAudioData(v, i);
     }
   }
-@@ -182,6 +184,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize];
+ }
+@@ -155,9 +157,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
 
-+      value = BaseAudioContext::ShuffleAudioData(value, i);
-+
-       // Scale from nominal -1 -> +1 to unsigned byte.
-       double scaled_value = 128 * (value + 1);
- 
-@@ -301,6 +305,8 @@ void RealtimeAnalyser::ConvertToByteData(DOMUint8Array* destination_array) {
-       double scaled_value =
+       // The range m_minDecibels to m_maxDecibels will be scaled to byte values
+       // from 0 to UCHAR_MAX.
+-      const double scaled_value =
+      double scaled_value =
           UCHAR_MAX * (db_mag - min_decibels) * range_scale_factor;
 
 +      scaled_value = BaseAudioContext::ShuffleAudioData(scaled_value, i);
 +
       // Clip to valid range.
-       destination[i] =
+       UNSAFE_TODO(destination[i]) =
           static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
-@@ -320,6 +326,7 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) {
-       float linear_value = source[i];
-       double db_mag = audio_utilities::LinearToDecibels(linear_value);
-       destination[i] = static_cast<float>(db_mag);
-+      destination[i] = BaseAudioContext::ShuffleAudioData(destination[i], i);
+@@ -188,6 +192,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
+                        kInputBufferSize]);
+ 
+      value = BaseAudioContext::ShuffleAudioData(value, i);
+       UNSAFE_TODO(destination[i]) = value;
     }
   }
- }
+@@ -211,10 +216,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+ 
+     for (unsigned i = 0; i < len; ++i) {
+       // Buffer access is protected due to modulo operation.
+-      const float value = UNSAFE_TODO(
+      float value = UNSAFE_TODO(
+           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
+                        kInputBufferSize]);
+ 
+      value = BaseAudioContext::ShuffleAudioData(value, i);
+
+       // Scale from nominal -1 -> +1 to unsigned byte.
+       const double scaled_value = 128 * (value + 1);
+ 
+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
+@@ -594,9 +594,8 @@
+     {
+       // AudioContext.playoutStats interface.
+       // https://chromestatus.com/feature/5172818344148992
+-      name: "AudioContextPlayoutStats",
+-      origin_trial_feature_name: "AudioContextPlayoutStats",
+-      status: "experimental",
+      name: "AudioContextPlayoutStats",   // keep AudioContextPlayoutStats
+      status: "experimental",             // experimental
+     },
+     {
+       name: "AudioContextSetSinkId",
 --
@@ -7,53 +7,26 @@ 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    | 16 ++++++++++
 .../execution_context/execution_context.h     |  1 +
 .../renderer/core/loader/base_fetch_context.h |  1 +
 .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
 .../core/loader/frame_fetch_context.h         |  1 +
 .../core/loader/worker_fetch_context.cc       | 21 +++++++++++++
 .../core/loader/worker_fetch_context.h        |  1 +
- .../core/workers/installed_scripts_manager.cc |  4 +--
+ .../core/workers/installed_scripts_manager.cc |  2 +-
 .../background_fetch_manager.cc               | 31 +++++++++++++++++++
 .../websockets/websocket_channel_impl.cc      |  5 +++
 .../modules/websockets/websocket_common.cc    | 30 ++++++++++++++++++
 .../modules/websockets/websocket_common.h     |  4 +++
- 12 files changed, 133 insertions(+), 2 deletions(-)
+ 11 files changed, 116 insertions(+), 1 deletion(-)

-diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
-+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -701,6 +701,22 @@ void ExecutionContext::WriteIntoTrace(
-   proto->set_world_type(GetWorldType(*this));
- }
- 
-+String ExecutionContext::addressSpaceForBindings() const {
-+  switch (AddressSpace()) {
-+    case network::mojom::IPAddressSpace::kPublic:
-+    case network::mojom::IPAddressSpace::kUnknown:
-+      return "public";
-+
-+    case network::mojom::IPAddressSpace::kPrivate:
-+      return "private";
-+
-+    case network::mojom::IPAddressSpace::kLocal:
-+      return "local";
-+  }
-+  NOTREACHED();
-+  return "public";
-+}
-+
- bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
-     const {
-   return Agent::IsWebSecurityDisabled() || CrossOriginIsolatedCapability();
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -397,6 +397,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
 
-   HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
+   HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
 +  String addressSpaceForBindings() const;
   unsigned ContextLifecycleStateObserverCountForTesting() const;
 
@@ -72,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -590,6 +590,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1057,6 +1057,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -85,7 +58,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
+    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -102,7 +75,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -166,6 +166,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -187,6 +187,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
@@ -134,7 +107,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
+    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -162,12 +135,9 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.h b/thi
 diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
 --- a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
 +++ b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
-@@ -33,9 +33,9 @@ InstalledScriptsManager::ScriptData::ScriptData(
-   // place so that this is shareable out of worker code.
-   response_address_space_ = network::mojom::IPAddressSpace::kPublic;
+@@ -35,7 +35,7 @@ InstalledScriptsManager::ScriptData::ScriptData(
   if (network_utils::IsReservedIPAddress(script_url_.Host()))
-    response_address_space_ = network::mojom::IPAddressSpace::kLocal;
-+    response_address_space_ = network::mojom::IPAddressSpace::kPrivate;
+     response_address_space_ = network::mojom::IPAddressSpace::kLocal;
   if (SecurityOrigin::Create(script_url_)->IsLocalhost())
 -    response_address_space_ = network::mojom::IPAddressSpace::kLoopback;
 +    response_address_space_ = network::mojom::IPAddressSpace::kLocal;
@@ -177,7 +147,7 @@ diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.c
 diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
-@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+@@ -104,6 +104,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
          request_url.ProtocolIsInHTTPFamily();
 }
 
@@ -194,7 +164,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 +    network::mojom::IPAddressSpace target_space =
 +        network::mojom::IPAddressSpace::kPublic;
 +    if (network_utils::IsReservedIPAddress(request_url.Host()))
-+      target_space = network::mojom::IPAddressSpace::kPrivate;
+      target_space = network::mojom::IPAddressSpace::kLocal;
 +    if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +      target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -208,7 +178,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(
+@@ -191,6 +215,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
                                  exception_state);
     }
 
@@ -225,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
-@@ -277,6 +277,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -285,6 +285,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
     return false;
   }
 
@@ -240,7 +210,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
-@@ -136,9 +136,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -139,9 +139,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
     return ConnectResult::kException;
   }
 
@@ -266,7 +236,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
+    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -0,0 +1,147 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 21 Sep 2024 14:36:25 +0000
+Subject: Block leakage of urls in sandbox iframes
+
+Preventing url base fallback leakage in cross orgin sandbox iframe.
+Addition of the ""block-url-leakage-sandbox-iframe" flag disabled by default.
+DO NOT ACTIVATE: the patch is a wip
+The aim is to understand whether it is possible to disable the
+leakage of certain information in sandbox iframes
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../browser/renderer_host/render_frame_host_impl.cc | 12 +++++++++++-
+ .../Block-url-leakage-sandbox-iframe.inc            |  8 ++++++++
+ .../Block-url-leakage-sandbox-iframe.inc            |  3 +++
+ .../features_h/Block-url-leakage-sandbox-iframe.inc |  1 +
+ third_party/blink/renderer/core/frame/location.cc   | 13 +++++++++++++
+ .../blink/renderer/core/loader/document_loader.cc   | 12 ++++++++++++
+ .../blink/renderer/core/loader/document_loader.h    |  2 +-
+ 7 files changed, 49 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+
+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
+@@ -5141,7 +5141,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+ }
+ 
+ void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
+-  inherited_base_url_ = inherited_base_url;
+  // we only inherit the base url if there's no sandbox,
+  // or if there is a sandbox but it has 'allow-same-origin'.
+  // See https://github.com/whatwg/html/issues/9025.
+  bool sandbox_flags_dont_exist_or_dont_include_allow_same_origin =
+      base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe) &&
+      (!policy_container_host_ ||
+      (active_sandbox_flags() & network::mojom::WebSandboxFlags::kOrigin) ==
+          network::mojom::WebSandboxFlags::kNone);
+  if (sandbox_flags_dont_exist_or_dont_include_allow_same_origin) {
+    inherited_base_url_ = inherited_base_url;
+  }
+ }
+ 
+ void RenderFrameHostImpl::SetLastCommittedOriginForTesting(
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
+
+    {"block-url-leakage-sandbox-iframe",
+     "Block leakage of urls in sandbox iframes",
+     "Block leakage for referrer, base url and ancestorOrigins in iframe with sandbox.", kOsAll,
+     FEATURE_VALUE_TYPE(blink::features::kBlockUrlLeakageSandboxIframe)},
+
+#endif
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1,3 @@
+CROMITE_FEATURE(kBlockUrlLeakageSandboxIframe,
+                "BlockUrlLeakageSandboxIframe",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1 @@
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBlockUrlLeakageSandboxIframe);
+diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/blink/renderer/core/frame/location.cc
+--- a/third_party/blink/renderer/core/frame/location.cc
+++ b/third_party/blink/renderer/core/frame/location.cc
+@@ -28,6 +28,7 @@
+ 
+ #include "third_party/blink/renderer/core/frame/location.h"
+ 
+#include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
+ #include "third_party/blink/renderer/core/dom/document.h"
+@@ -126,8 +127,20 @@ DOMStringList* Location::ancestorOrigins() const {
+   auto* origins = MakeGarbageCollected<DOMStringList>();
+   if (!IsAttached())
+     return origins;
+  if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
+        && dom_window_->GetFrame()->GetSecurityContext()->IsSandboxed(
+              network::mojom::WebSandboxFlags::kOrigin)) {
+    // not allow any value for sandboxed frames
+    return origins;
+  }
+   for (Frame* frame = dom_window_->GetFrame()->Tree().Parent(); frame;
+        frame = frame->Tree().Parent()) {
+    if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
+          && frame->GetSecurityContext()->IsSandboxed(
+                network::mojom::WebSandboxFlags::kOrigin)) {
+      // blocks at first sandbox frame
+      break;
+    }
+     origins->Append(
+         frame->GetSecurityContext()->GetSecurityOrigin()->ToString());
+   }
+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
+@@ -833,6 +833,11 @@ WebString DocumentLoader::HttpMethod() const {
+ }
+ 
+ const AtomicString& DocumentLoader::GetReferrer() const {
+  if (base::FeatureList::IsEnabled(features::kBlockUrlLeakageSandboxIframe)
+      && frame_->DomWindow()->GetSecurityContext().IsSandboxed(
+            network::mojom::WebSandboxFlags::kOrigin)) {
+    return g_null_atom;
+  }
+   return referrer_;
+ }
+ 
+@@ -2901,6 +2906,13 @@ void DocumentLoader::CommitNavigation() {
+         response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
+   }
+ 
+  if (base::FeatureList::IsEnabled(features::kBlockUrlLeakageSandboxIframe) &&
+      frame_->DomWindow()->GetSecurityContext().IsSandboxed(
+          network::mojom::WebSandboxFlags::kOrigin)) {
+    // If an frame is sandboxed don't give it an inherited base url.
+    fallback_base_url_ = KURL();
+  }
+
+   navigation_scroll_allowed_ = !frame_->DomWindow()->IsFeatureEnabled(
+       mojom::blink::DocumentPolicyFeature::kForceLoadAtTop);
+ 
+diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
+--- a/third_party/blink/renderer/core/loader/document_loader.h
+++ b/third_party/blink/renderer/core/loader/document_loader.h
+@@ -771,7 +771,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+   // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set.
+   bool loading_main_document_from_mhtml_archive_ = false;
+   const bool loading_srcdoc_ = false;
+-  const KURL fallback_base_url_;
+  KURL fallback_base_url_; // Non-const for sandbox overrides.
+   const bool loading_url_as_empty_document_ = false;
+   const bool is_static_data_ = false;
+   CommitReason commit_reason_ = CommitReason::kRegular;
+--
@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
   if (base::IsStringASCII(scheme) &&
       (ProfileIOData::IsHandledProtocol(scheme) ||
        base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
@@ -49,7 +49,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
-@@ -174,6 +174,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -136,6 +136,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
       continue;
     }
 
@@ -64,7 +64,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -90,10 +90,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
+@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
 bool HasScheme(const std::u16string& input, const char* scheme) {
   std::string utf8_input(base::UTF16ToUTF8(input));
   url::Component view_source_scheme;
@@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
   return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
 }
 
-@@ -581,7 +586,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -578,7 +583,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 +93,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -576,6 +576,10 @@ GURL FixupURLInternal(const std::string& text,
+@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& text,
     }
   }
 
@@ -102,23 +102,23 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 +  }
 +
   // We handle the file scheme separately.
-   if (scheme == url::kFileScheme)
+   if (scheme == url::kFileScheme) {
     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 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
-@@ -837,6 +837,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -970,6 +970,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
   RegisterPseudoScheme(url::kJavaScriptScheme);
   RegisterPseudoScheme(kViewSourceScheme);
   RegisterPseudoScheme(kGoogleChromeScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
 }
 
- ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
+ ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() = default;
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1012,6 +1012,8 @@ component("net") {
+@@ -1137,6 +1137,8 @@ component("net") {
     "url_request/url_request_http_job.cc",
     "url_request/url_request_http_job.h",
     "url_request/url_request_interceptor.cc",
@@ -195,15 +195,15 @@ new file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -13,6 +13,7 @@
- #include "base/metrics/histogram_macros.h"
+@@ -15,6 +15,7 @@
+ #include "base/notreached.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
 +#include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/task/single_thread_task_runner.h"
- #include "base/types/pass_key.h"
-@@ -47,6 +48,7 @@
+ #include "base/types/optional_util.h"
+@@ -55,6 +56,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 namespace net {
 
-@@ -591,6 +593,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
   // Sanity check out environment.
   DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
 
@@ -227,7 +227,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -48,6 +48,7 @@
+@@ -55,6 +55,7 @@
 #include "net/socket/network_binding_client_socket_factory.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
@@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "url/url_constants.h"
-@@ -575,6 +576,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -619,6 +620,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     job_factory->SetProtocolHandler(scheme_handler.first,
                                     std::move(scheme_handler.second));
   }
@@ -247,8 +247,8 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 diff --git a/url/url_constants.h b/url/url_constants.h
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
-@@ -31,6 +31,7 @@ inline constexpr char kDataScheme[] = "data";
- inline constexpr char16_t kDataScheme16[] = u"data";
+@@ -34,6 +34,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";
@@ -258,7 +258,7 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -47,6 +47,7 @@ struct SchemeRegistry {
+@@ -54,6 +54,7 @@ struct SchemeRegistry {
   std::vector<SchemeWithType> standard_schemes = {
       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -266,7 +266,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
       // Yes, file URLs can have a hostname, so file URLs should be handled as
       // "standard". File URLs never have a port as specified by the SchemeType
       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -92,6 +93,7 @@ struct SchemeRegistry {
+@@ -99,6 +100,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -2,31 +2,15 @@ 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
 ---
- .../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(+)
+ .../menu/bookmark_toolbar_menu_improved.xml    |  7 +++++++
+ .../browser/bookmarks/BookmarkToolbar.java     | 18 ++++++++++++++++++
+ .../android/strings/android_chrome_strings.grd |  3 +++
+ 3 files changed, 28 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
@@ -44,56 +28,59 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
         <item
             android:id="@+id/import_menu_id"
             android:icon="@drawable/ic_folder_blue_24dp"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -28,6 +28,8 @@ import java.util.ArrayList;
+diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+@@ -28,6 +28,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
- 
 +import java.util.HashSet;
-+
+ 
 /**
  * Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
-  * the current context.
-@@ -184,6 +186,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
- 
+@@ -190,6 +191,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
     void setCurrentFolder(BookmarkId folder) {
         mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
+         enableImportExportMenu();
+        enableSelectAllMenu();
+    }
+
+    void enableSelectAllMenu() {
 +        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);
     }
-@@ -212,6 +215,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+ 
+     void enableImportExportMenu() {
+@@ -226,6 +232,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
             mExportBookmarkRunnable.run();
             return true;
         }
 +        if (menuItem.getItemId() == R.id.select_all_menu_id) {
 +            if (mBookmarkModel.isBookmarkModelLoaded()) {
-+                List<BookmarkItem> items = mBookmarkModel.getBookmarksForFolder(mCurrentFolder.getId());
-+                HashSet<BookmarkId> ids = new HashSet<>(items.size());
-+                for (BookmarkItem item : items) {
-+                    ids.add(item.getId());
+                List<BookmarkId> childs = mBookmarkModel.getChildIds(mCurrentFolder.getId());
+                HashSet<BookmarkId> ids = new HashSet<>(childs.size());
+                for (BookmarkId item : childs) {
+                    ids.add(item);
 +                }
 +                mSelectionDelegate.setSelectedItems(ids);
 +            }
 +            return true;
 +        }
-         return mMenuIdClickedFunction.apply(menuItem.getItemId());
+         return assumeNonNull(mMenuIdClickedFunction).apply(menuItem.getItemId());
     }
 
-@@ -234,6 +248,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -248,6 +265,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.
-         setSearchButtonVisible(mSearchButtonVisible);
+         setEditButtonVisible(mEditButtonVisible);
 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
-@@ -253,6 +253,9 @@ CHAR_LIMIT guidelines:
+@@ -249,6 +249,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() {
+@@ -27,7 +27,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.
@@ -21,38 +21,37 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../java/res/xml/adblock_preferences.xml      |  25 ++
 .../android/java/res/xml/main_preferences.xml |   5 +
 .../browser/settings/AdBlockEditor.java       |  91 ++++++
- .../browser/settings/AdBlockPreferences.java  |  58 ++++
- .../chrome/browser/tabmodel/TabModelImpl.java |   2 +-
+ .../browser/settings/AdBlockPreferences.java  |  74 +++++
+ .../browser/settings/SettingsActivity.java    |   3 +
 chrome/app/generated_resources.grd            |  10 +
 chrome/browser/after_startup_task_utils.cc    |   4 +
 chrome/browser/browser_process.h              |   6 +
- chrome/browser/browser_process_impl.cc        |  21 ++
+ chrome/browser/browser_process_impl.cc        |  28 ++
 chrome/browser/browser_process_impl.h         |   2 +
 chrome/browser/chrome_browser_main.cc         |   3 +
 chrome/browser/flags/BUILD.gn                 |   3 +
 .../flags/android/adblock_native_gateway.cc   |  31 ++
 .../browser/flags/AdBlockNativeGateway.java   |  30 ++
- .../net/system_network_context_manager.cc     |   8 +
- .../sessions/session_restore_android.cc       |   6 +-
+ .../net/system_network_context_manager.cc     |   4 +
+ .../sessions/session_restore_android.cc       |   7 +-
 .../strings/android_chrome_strings.grd        |  14 +
 chrome/common/pref_names.h                    |   5 +
 .../strings/android/site_settings.grdp        |   3 +
- components/component_updater/BUILD.gn         |   7 +
+ components/component_updater/BUILD.gn         |   8 +
 .../adblock_updater_service.cc                | 281 ++++++++++++++++++
 .../adblock_updater_service.h                 | 103 +++++++
- .../download_filters_task.cc                  | 239 +++++++++++++++
+ .../download_filters_task.cc                  | 250 ++++++++++++++++
 .../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 |  46 ++-
+ .../content/shared/browser/ruleset_service.cc |  44 ++-
 .../content/shared/browser/ruleset_service.h  |   8 +-
 .../unindexed_ruleset_stream_generator.cc     |   3 +
 .../core/browser/ruleset_version.h            |   4 +
- .../browser/subresource_filter_features.cc    | 116 +-------
- .../core/browser/verified_ruleset_dealer.cc   |   3 +
+ .../browser/subresource_filter_features.cc    | 118 +-------
+ .../core/browser/verified_ruleset_dealer.cc   |   4 +
 .../core/common/indexed_ruleset.cc            |   5 +-
- .../Bromite-subresource-adblocker.inc         |   3 +
- 40 files changed, 1259 insertions(+), 126 deletions(-)
+ 39 files changed, 1287 insertions(+), 129 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -63,13 +62,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 create mode 100644 components/component_updater/adblock_updater_service.h
 create mode 100644 components/component_updater/download_filters_task.cc
 create mode 100644 components/component_updater/download_filters_task.h
- create mode 100644 cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc

 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) {
-       "//chrome/android/modules/cablev2_authenticator/public:java",
+@@ -324,6 +324,7 @@ if (_is_default_toolchain) {
+       "//chrome/android/features/tab_ui/public:ui_java_resources",
       "//chrome/android/modules/stack_unwinder/provider:java",
       "//chrome/android/webapk/libs/client:client_java",
 +      "//chrome/browser/endpoint_fetcher:java",
@@ -79,27 +77,27 @@ 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
-@@ -427,6 +427,7 @@ chrome_java_resources = [
-   "java/res/layout/account_chooser_dialog_title.xml",
+@@ -424,6 +424,7 @@ chrome_java_resources = [
   "java/res/layout/account_divider_preference.xml",
   "java/res/layout/account_management_account_row.xml",
+   "java/res/layout/app_history_filter.xml",
 +  "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",
-@@ -630,6 +631,7 @@ chrome_java_resources = [
-   "java/res/xml/about_chrome_preferences.xml",
+@@ -613,6 +614,7 @@ chrome_java_resources = [
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.xml",
+   "java/res/xml/appearance_preferences.xml",
 +  "java/res/xml/adblock_preferences.xml",
   "java/res/xml/bookmark_widget_info.xml",
-   "java/res/xml/clear_browsing_data_preferences_tab.xml",
+   "java/res/xml/clear_browsing_data_preferences.xml",
   "java/res/xml/contextual_search_preferences.xml",
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -973,6 +973,8 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
+@@ -909,6 +909,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
 +  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
@@ -182,7 +180,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -245,6 +245,24 @@ found in the LICENSE file.
+@@ -311,6 +311,24 @@ found in the LICENSE file.
         </item>
     </style>
 
@@ -210,13 +208,13 @@ 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.
+@@ -22,6 +22,10 @@ found in the LICENSE file.
     <!-- Compositor Tab Title Text -->
     <bool name="compositor_tab_title_fake_bold_text">true</bool>
 
 +    <string name="adblock_on">Autoupdate enabled</string>
 +    <string name="adblock_off">Autoupdate disabled</string>
-+    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>
+    <string name="adblock_help_url">https://github.com/uazo/cromite/blob/master/docs/BROMITE_LEGACY_ADBLOCK.md</string>
 +
     <string name="proxy_title">Proxy configuration</string>
     <string name="proxy_url">chrome://proxy</string>
@@ -254,10 +252,10 @@ 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"
-         android:title="@string/prefs_safety_check"/>
+@@ -111,6 +111,11 @@ found in the LICENSE file.
+         android:key="toolbar_shortcut"
+         android:order="21"
+         android:title="@string/toolbar_shortcut"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
 +        android:key="adblock"
@@ -265,7 +263,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="22"
 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
@@ -366,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBloc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,74 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -376,30 +374,46 @@ new file mode 100644
 +import android.os.Bundle;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceFragmentCompat;
-+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+
+import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.Supplier;
 +
 +import org.chromium.content_public.browser.BrowserContextHandle;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 +import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
 +import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
-+import org.chromium.chrome.browser.flags.AdBlockNativeGateway;
-+import androidx.annotation.VisibleForTesting;
+import org.chromium.components.browser_ui.settings.SettingsFragment;
+
 +import org.chromium.chrome.R;
+import org.chromium.chrome.browser.flags.AdBlockNativeGateway;
+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +
 +/**
 + * Fragment that allows the user to configure AdBlock related preferences.
 + */
-+public class AdBlockPreferences extends BaseSiteSettingsFragment {
-+    @VisibleForTesting
+public class AdBlockPreferences extends ChromeBaseSettingsFragment {
 +    public static final String PREF_ADBLOCK_SWITCH = "adblock_switch";
 +    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
 +
 +    private Preference mAdBlockEdit;
+    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+
+    @Override
+    public ObservableSupplier<String> getPageTitle() {
+        return mPageTitle;
+    }
+
+    @Override
+    public @SettingsFragment.AnimationType int getAnimationType() {
+        return SettingsFragment.AnimationType.PROPERTY;
+    }
 +
 +    @Override
 +    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+        getActivity().setTitle(R.string.options_adblock_title);
+        mPageTitle.set(getString(R.string.options_adblock_title));
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
 +
 +        ChromeSwitchPreference mAdBlockSwitch =
@@ -425,22 +439,30 @@ new file mode 100644
 +        updateCurrentAdBlockUrl();
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-@@ -862,7 +862,7 @@ public class TabModelImpl extends TabModelJniBridge {
-     protected boolean createTabWithWebContents(
-             Tab parent, Profile profile, WebContents webContents) {
-         return getTabCreator(profile.isOffTheRecord())
-                .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_RECENT_TABS);
-+                .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_LINK);
-     }
+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
+@@ -75,6 +75,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
+ import java.lang.ref.WeakReference;
+ import java.util.Locale;
 
-     @Override
+import org.chromium.chrome.browser.settings.AdBlockEditor;
+
+ /**
+  * The Chrome settings activity.
+  *
+@@ -698,6 +700,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+             if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
+                 return;
+             }
+            if (fragment instanceof AdBlockEditor) return;
+ 
+             String className = fragment.getClass().getSimpleName();
+             RecordHistogram.recordSparseHistogram(
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -15173,6 +15173,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -17032,6 +17032,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Never show this again.
     </message>
 
@@ -460,16 +482,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
-@@ -29,6 +29,8 @@
- #include "chromeos/startup/browser_params_proxy.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -24,6 +24,8 @@
+ #include "chrome/browser/ui/ash/login/login_display_host.h"
+ #endif
 
 +#include "chrome/browser/browser_process.h"
 +
 using content::BrowserThread;
 
 namespace {
-@@ -132,6 +134,8 @@ void SetBrowserStartupIsComplete() {
+@@ -129,6 +131,8 @@ void SetBrowserStartupIsComplete() {
   }
   GetAfterStartupTasks().clear();
   GetAfterStartupTasks().shrink_to_fit();
@@ -481,15 +503,15 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -21,6 +21,7 @@
- #include "build/chromeos_buildflags.h"
+@@ -31,6 +31,7 @@
 #include "chrome/common/buildflags.h"
+ #include "components/safe_browsing/buildflags.h"
 #include "media/media_buildflags.h"
 +#include "components/component_updater/adblock_updater_service.h"
 
 class BackgroundModeManager;
 class BrowserProcessPlatformPart;
-@@ -71,6 +72,10 @@ namespace component_updater {
+@@ -88,6 +89,10 @@ namespace component_updater {
 class ComponentUpdateService;
 }
 
@@ -497,10 +519,10 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 +class AdBlockUpdaterService;
 +}
 +
- namespace extensions {
- class EventRouterForwarder;
+ namespace gcm {
+ class GCMDriver;
 }
-@@ -253,6 +258,7 @@ class BrowserProcess {
+@@ -271,6 +276,7 @@ class BrowserProcess {
 #endif
 
   virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -511,7 +533,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1183,6 +1183,27 @@ BrowserProcessImpl::component_updater() {
+@@ -1270,6 +1270,34 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -526,6 +548,13 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 +  std::unique_ptr<component_updater::UpdateScheduler> scheduler =
 +      std::make_unique<component_updater::TimerUpdateScheduler>();
 +
+  auto adblock_updater_url =
+    local_state()->GetString(prefs::kAdBlockFiltersURL);
+  if (base::StartsWith(adblock_updater_url,
+        "https://www.bromite.org", base::CompareCase::INSENSITIVE_ASCII)) {
+    local_state()->SetString(prefs::kAdBlockFiltersURL, "about:blank");
+  }
+
 +  adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
 +          g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
 +          std::move(scheduler),
@@ -550,7 +579,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
   MediaFileSystemRegistry* media_file_system_registry() override;
   WebRtcLogUploader* webrtc_log_uploader() override;
   network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -413,6 +414,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -429,6 +430,7 @@ class BrowserProcessImpl : public BrowserProcess,
   // to concerns over integrity of data shared between profiles,
   // but some users of component updater only install per-user.
   std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -561,7 +590,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -455,6 +455,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -387,6 +387,9 @@ StartupProfileInfo CreateInitialProfile(
   // missing code in the above test.
   CHECK(profile_info.profile) << "Cannot get default profile.";
 
@@ -569,8 +598,8 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 +  g_browser_process->adblock_updater();
 +
 #else
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   // Lacros has a special "primary" profile that is tied to the active ChromeOS
+   profile_info =
+       GetStartupProfile(/*cur_dir=*/base::FilePath(), parsed_command_line);
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
@@ -582,7 +611,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
-@@ -33,6 +34,7 @@ android_library("java") {
+@@ -47,6 +48,7 @@ java_bromite_impl("java_cromite_cached_flags") {
 generate_jni("jni_headers") {
   sources = [ "android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java" ]
   sources += [
@@ -590,7 +619,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
     "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
   ]
-@@ -47,6 +49,7 @@ static_library("flags_android") {
+@@ -61,6 +63,7 @@ static_library("flags_android") {
     "android/chrome_session_state.cc",
     "android/chrome_session_state.h",
   ]
@@ -672,17 +701,13 @@ 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
-@@ -640,6 +640,14 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
- void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
-   StubResolverConfigReader::RegisterPrefs(registry);
+@@ -717,6 +717,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+   DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
+   NetworkProcessLaunchWatcher::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");
+    "about:blank");
 +
   // Static auth params
   registry->RegisterStringPref(prefs::kAuthSchemes,
@@ -690,14 +715,15 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
 --- a/chrome/browser/sessions/session_restore_android.cc
 +++ b/chrome/browser/sessions/session_restore_android.cc
-@@ -56,8 +56,10 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
+@@ -58,8 +58,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
   DCHECK(current_tab);
   // If swapped, return the current tab's most up-to-date web contents.
   if (disposition == WindowOpenDisposition::CURRENT_TAB) {
 -    current_tab->SwapWebContents(std::move(new_web_contents), false, false);
 -    return current_tab->web_contents();
 +    int active_tab_index = tab_model->GetActiveIndex();
-+    tab_model->CreateTab(current_tab, new_web_contents.release());
+    tab_model->CreateTab(current_tab, new_web_contents.release(),
+      disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
 +    tab_model->CloseTabAt(active_tab_index);
 +    return raw_new_web_contents;
   }
@@ -706,8 +732,8 @@ 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
-@@ -225,6 +225,20 @@ CHAR_LIMIT guidelines:
-         Control your data &amp; accounts
+@@ -221,6 +221,20 @@ CHAR_LIMIT guidelines:
+         <ph name="PREF_TITLE">%1$s</ph>  <ph name="BEGIN_NEW">&lt;new&gt;</ph>New<ph name="END_NEW">&lt;/new&gt;</ph>
       </message>
 
 +      <!-- AdBlock settings -->
@@ -730,7 +756,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2688,6 +2688,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2919,6 +2919,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 inline constexpr char kAudioCaptureAllowedUrls[] =
     "hardware.audio_capture_allowed_urls";
 
@@ -745,7 +771,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -368,6 +368,9 @@
+@@ -403,6 +403,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>
@@ -758,7 +784,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
 diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
 --- a/components/component_updater/BUILD.gn
 +++ b/components/component_updater/BUILD.gn
-@@ -16,6 +16,12 @@ static_library("component_updater") {
+@@ -19,6 +19,12 @@ static_library("component_updater") {
     "component_installer.h",
     "component_updater_command_line_config_policy.cc",
     "component_updater_command_line_config_policy.h",
@@ -771,7 +797,7 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
     "component_updater_service.cc",
     "component_updater_service.h",
     "component_updater_service_internal.h",
-@@ -48,6 +54,7 @@ static_library("component_updater") {
+@@ -49,9 +55,11 @@ static_library("component_updater") {
     "//components/update_client",
     "//components/version_info",
     "//net",
@@ -779,6 +805,10 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
     "//third_party/boringssl",
     "//ui/base",
     "//url",
+    "//content/common:buildflags"
+   ]
+ }
+ 
 diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
 new file mode 100644
 --- /dev/null
@@ -1177,7 +1207,7 @@ diff --git a/components/component_updater/download_filters_task.cc b/components/
 new file mode 100644
 --- /dev/null
 +++ b/components/component_updater/download_filters_task.cc
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,250 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1347,10 +1377,21 @@ new file mode 100644
 +  final_url_ = final_url;
 +  response_code_ = response_head.headers ? response_head.headers->response_code() : -1;
 +
-+  if (!response_head.headers->GetLastModifiedValue(&last_modified_))
-+    LOG(WARNING) << "DownloadFiltersTask: fetching URL '" << final_url.spec() << "' with method " << (min_last_modified_.is_null() ? "GET" : "HEAD") << " (no Last-Modified header)";
-+  else
-+    LOG(INFO) << "DownloadFiltersTask: fetching URL '" << final_url.spec() << "' with method " << (min_last_modified_.is_null() ? "GET" : "HEAD");
+  std::optional<base::Time> last_modified_value =
+          response_head.headers->GetLastModifiedValue();
+  if (last_modified_value) {
+    last_modified_ = last_modified_value.value();
+    LOG(INFO) << "DownloadFiltersTask: fetching URL '"
+              << final_url.spec()
+              << "' with method "
+              << (min_last_modified_.is_null() ? "GET" : "HEAD");
+  } else {
+    LOG(WARNING) << "DownloadFiltersTask: fetching URL '"
+                 << final_url.spec()
+                 << "' with method "
+                 << (min_last_modified_.is_null() ? "GET" : "HEAD")
+                 << " (no Last-Modified header)";
+  }
 +}
 +
 +void DownloadFiltersTask::OnDownloadComplete(base::FilePath file_path) {
@@ -1554,17 +1595,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
-@@ -15,6 +15,9 @@
- #include "base/strings/stringprintf.h"
+@@ -18,6 +18,9 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/traced_value.h"
+ #include "base/tracing/protos/chrome_track_event.pbzero.h"
 +#include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
 #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
- #include "components/subresource_filter/content/browser/page_load_statistics.h"
-@@ -151,6 +154,7 @@ ContentSubresourceFilterThrottleManager::
+ #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
+@@ -114,6 +117,7 @@ ContentSubresourceFilterThrottleManager::
       profile_interaction_manager_(
           std::make_unique<subresource_filter::ProfileInteractionManager>(
               profile_context)),
@@ -1572,17 +1613,17 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
       web_contents_helper_(web_contents_helper) {}
 
 ContentSubresourceFilterThrottleManager::
-@@ -675,6 +679,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -628,6 +632,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
 +
-+    const GURL& url(navigation_handle->GetURL());
+    const GURL& url(navigation_handle.GetURL());
 +    if (profile_context_->settings_manager()->GetSitePermission(url) != CONTENT_SETTING_ALLOW) {
 +      subresource_filter::ActivationDecision ignored_decision;
 +      mojom::ActivationState ad_filtering_state;
 +      ad_filtering_state.activation_level = profile_interaction_manager_->OnPageActivationComputed(
-+	      navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
+	      &navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
 +      throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
 +                                                ad_filtering_state);
 +    }
@@ -1593,7 +1634,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
-@@ -413,6 +413,8 @@ class ContentSubresourceFilterThrottleManager
+@@ -403,6 +403,8 @@ class ContentSubresourceFilterThrottleManager
 
   std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
 
@@ -1605,34 +1646,36 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 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
-@@ -47,9 +47,7 @@ namespace {
- 
+@@ -50,12 +50,7 @@ namespace {
 void RecordIndexAndWriteRulesetResult(
+     std::string_view uma_tag,
     RulesetService::IndexAndWriteRulesetResult result) {
-  UMA_HISTOGRAM_ENUMERATION(
-      "SubresourceFilter.WriteRuleset.Result", static_cast<int>(result),
-      static_cast<int>(RulesetService::IndexAndWriteRulesetResult::MAX));
+-  base::UmaHistogramEnumeration(
+-      base::StrCat({uma_tag, ".WriteRuleset.Result"}), result,
+-      static_cast<RulesetService::IndexAndWriteRulesetResult>(
+-          static_cast<int>(
+-              RulesetService::IndexAndWriteRulesetResult::kMaxValue) +
+-          1));
 +  VLOG(1) << "SubresourceFilter.WriteRuleset.Result: " << static_cast<int>(result);
 }
 
 // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -228,10 +226,13 @@ RulesetService::RulesetService(
- RulesetService::~RulesetService() {}
+@@ -237,11 +232,13 @@ RulesetService::RulesetService(
+ RulesetService::~RulesetService() = default;
 
 void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
 -    const UnindexedRulesetInfo& unindexed_ruleset_info) {
-  if (unindexed_ruleset_info.content_version.empty())
 +    const UnindexedRulesetInfo& unindexed_ruleset_info, bool ignore_recent_version) {
-+  if (unindexed_ruleset_info.content_version.empty()) {
+   if (unindexed_ruleset_info.content_version.empty()) {
 +    LOG(INFO) << "RulesetService: ignoring update with empty version.";
     return;
-+  }
+   }
 
 +  if (!ignore_recent_version) {
   // 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
-@@ -241,13 +242,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -251,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
   if (most_recently_indexed_version.IsCurrentFormatVersion() &&
       most_recently_indexed_version.content_version ==
           unindexed_ruleset_info.content_version) {
@@ -1649,7 +1692,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     return;
   }
 
-@@ -267,6 +271,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -277,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
     const RulesetConfig& config,
     const base::FilePath& indexed_ruleset_base_dir,
     const UnindexedRulesetInfo& unindexed_ruleset_info) {
@@ -1673,28 +1716,29 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-@@ -274,6 +295,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -284,6 +301,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(
-         IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET);
-     return IndexedRulesetVersion(config.filter_tag);
-@@ -287,6 +309,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+         config.uma_tag,
+         IndexAndWriteRulesetResult::kFailedOpeningUnindexedRuleset);
+@@ -298,6 +316,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(
-         IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR);
+         config.uma_tag, IndexAndWriteRulesetResult::kFailedCreatingVersionDir);
     return IndexedRulesetVersion(config.filter_tag);
-@@ -294,12 +317,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -305,13 +324,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
 
   SentinelFile sentinel_file(indexed_ruleset_version_dir);
   if (sentinel_file.IsPresent()) {
 -    RecordIndexAndWriteRulesetResult(
-        IndexAndWriteRulesetResult::ABORTED_BECAUSE_SENTINEL_FILE_PRESENT);
+-        config.uma_tag,
+-        IndexAndWriteRulesetResult::kAbortedBecauseSentinelFilePresent);
 -    return IndexedRulesetVersion(config.filter_tag);
 +    LOG(WARNING) << "RulesetService: sentinel file is present in " << indexed_ruleset_version_dir;
   }
@@ -1702,42 +1746,41 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
   if (!sentinel_file.Create()) {
 +    LOG(WARNING) << "RulesetService: cannot create sentinel file in " << indexed_ruleset_version_dir;
     RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_CREATING_SENTINEL_FILE);
-     return IndexedRulesetVersion(config.filter_tag);
-@@ -312,6 +334,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
- 
+         config.uma_tag,
+         IndexAndWriteRulesetResult::kFailedCreatingSentinelFile);
+@@ -326,6 +343,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
   RulesetIndexer indexer;
-   if (!(*g_index_ruleset_func)(&unindexed_ruleset_stream_generator, &indexer)) {
+   if (!(*g_index_ruleset_func)(config, &unindexed_ruleset_stream_generator,
+                                &indexer)) {
 +    LOG(WARNING) << "RulesetService: failed parsing.";
     RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET);
-     return IndexedRulesetVersion(config.filter_tag);
-@@ -329,8 +352,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
-       WriteRuleset(indexed_ruleset_version_dir,
+         config.uma_tag,
+         IndexAndWriteRulesetResult::kFailedParsingUnindexedRuleset);
+@@ -346,9 +364,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
                    unindexed_ruleset_info.license_path, indexer.data());
-   RecordIndexAndWriteRulesetResult(result);
-  if (result != IndexAndWriteRulesetResult::SUCCESS)
-+  if (result != IndexAndWriteRulesetResult::SUCCESS) {
+   RecordIndexAndWriteRulesetResult(config.uma_tag, result);
+   if (result != IndexAndWriteRulesetResult::kSuccess) {
 +    LOG(INFO) << "RulesetService: failed to index.";
     return IndexedRulesetVersion(config.filter_tag);
-+  }
-+
-+  LOG(INFO) << "RulesetService: successful parsing.";
+   }
 
-   DCHECK(indexed_version.IsValid());
+  LOG(INFO) << "RulesetService: successful parsing.";
+
+   CHECK(indexed_version.IsValid());
   return indexed_version;
-@@ -452,6 +479,7 @@ void RulesetService::IndexAndStoreRuleset(
+ }
+@@ -472,6 +493,7 @@ void RulesetService::IndexAndStoreRuleset(
 void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback,
                                       const IndexedRulesetVersion& version) {
-   DCHECK(!result_callback.is_null());
+   CHECK(!result_callback.is_null());
 +  LOG(INFO) << "RulesetService: valid version: " << version.IsValid();
-   if (!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 {
+@@ -183,7 +183,7 @@ class RulesetService {
   //
   // Virtual so that it can be mocked out in tests.
   virtual void IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1782,7 +1825,7 @@ diff --git a/components/subresource_filter/content/shared/browser/unindexed_rule
 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 {
+@@ -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;
@@ -1796,7 +1839,7 @@ diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/comp
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,72 +55,7 @@ class CommaSeparatedStrings {
+@@ -55,75 +55,8 @@ class CommaSeparatedStrings {
   const std::vector<std::string_view> pieces_;
 };
 
@@ -1804,31 +1847,33 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -    std::map<std::string, std::string>* params,
 -    const std::string& key) {
 -  auto it = params->find(key);
-  if (it == params->end())
+-  if (it == params->end()) {
 -    return std::string();
+-  }
 -  std::string value = std::move(it->second);
 -  params->erase(it);
 -  return value;
 -}
 -
-mojom::ActivationLevel ParseActivationLevel(
-    const std::string_view activation_level) {
+-mojom::ActivationLevel ParseActivationLevel(std::string_view activation_level) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_level,
-                                       kActivationLevelEnabled))
+-                                       kActivationLevelEnabled)) {
 -    return mojom::ActivationLevel::kEnabled;
-  else if (base::EqualsCaseInsensitiveASCII(activation_level,
-                                            kActivationLevelDryRun))
+-  } else if (base::EqualsCaseInsensitiveASCII(activation_level,
+-                                              kActivationLevelDryRun)) {
 -    return mojom::ActivationLevel::kDryRun;
+-  }
 -  return mojom::ActivationLevel::kDisabled;
 -}
 -
-ActivationScope ParseActivationScope(const std::string_view activation_scope) {
+-ActivationScope ParseActivationScope(std::string_view activation_scope) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_scope,
-                                       kActivationScopeAllSites))
+-                                       kActivationScopeAllSites)) {
 -    return ActivationScope::ALL_SITES;
-  else if (base::EqualsCaseInsensitiveASCII(activation_scope,
-                                            kActivationScopeActivationList))
+-  } else if (base::EqualsCaseInsensitiveASCII(activation_scope,
+-                                              kActivationScopeActivationList)) {
 -    return ActivationScope::ACTIVATION_LIST;
+-  }
 -  return ActivationScope::NO_SITES;
 -}
 -
@@ -1853,24 +1898,25 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -// Will return a value between 0 and 1 inclusive.
 -double ParsePerformanceMeasurementRate(const std::string& rate) {
 -  double value = 0.0;
-  if (!base::StringToDouble(rate, &value) || value < 0)
+-  if (!base::StringToDouble(rate, &value) || value < 0) {
 -    return 0.0;
+-  }
 -  return value < 1 ? value : 1;
 -}
 -
-int ParseInt(const std::string_view value) {
+-int ParseInt(std::string_view value) {
 -  int result = 0;
 -  base::StringToInt(value, &result);
 -  return result;
 -}
 -
-std::vector<Configuration> FillEnabledPresetConfigurations(
+ std::vector<Configuration> FillEnabledPresetConfigurations(
 -    std::map<std::string, std::string>* params) {
-+std::vector<Configuration> FillEnabledPresetConfigurations() {
+    /*std::map<std::string, std::string>* params*/) {
   // If ad tagging is enabled, turn on the dryrun automatically.
   bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
   const struct {
-@@ -128,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -131,23 +64,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
     bool enabled_by_default;
     Configuration (*factory_method)();
   } kAvailablePresetConfigurations[] = {
@@ -1896,7 +1942,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
       enabled_configurations.push_back(available_preset.factory_method());
     }
   }
-@@ -152,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -155,48 +81,12 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
   return enabled_configurations;
 }
 
@@ -1935,19 +1981,29 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  base::GetFieldTrialParamsByFeature(kSafeBrowsingSubresourceFilter, &params);
 -
   std::vector<Configuration> configs;
-   if (base::FeatureList::IsEnabled(kSafeBrowsingSubresourceFilter))
+   if (base::FeatureList::IsEnabled(kSafeBrowsingSubresourceFilter)) {
 -    configs = FillEnabledPresetConfigurations(&params);
-
+    configs = FillEnabledPresetConfigurations();
+   }
+ 
 -  Configuration experimental_config = ParseExperimentalConfiguration(&params);
 -  configs.push_back(std::move(experimental_config));
-+    configs = FillEnabledPresetConfigurations();
- 
+-
   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
-@@ -38,6 +38,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
+@@ -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/notreached.h"
+ #include "base/task/sequenced_task_runner.h"
+ #include "base/trace_event/trace_event.h"
+@@ -39,6 +40,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
                file->IsValid());
@@ -1965,10 +2021,10 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
 #include "base/check.h"
 #include "base/hash/hash.h"
 +#include "base/logging.h"
- #include "base/metrics/histogram_macros.h"
+ #include "base/metrics/histogram_functions.h"
+ #include "base/strings/strcat.h"
 #include "base/trace_event/trace_event.h"
- #include "components/subresource_filter/core/common/first_party_origin.h"
-@@ -36,7 +37,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
+@@ -37,7 +38,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());
@@ -1979,12 +2035,4 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
     return flat::VerifyIndexedRulesetBuffer(verifier)
                ? VerifyStatus::kChecksumFailVerifierPass
                : VerifyStatus::kChecksumFailVerifierFail;
-diff --git a/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc b/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc
-new file mode 100644
--- /dev/null
-+++ b/cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc
-@@ -0,0 +1,3 @@
-+SET_CROMITE_FEATURE_ENABLED(kAutomaticLazyFrameLoadingToAds);
-+SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbeds);
-+SET_CROMITE_FEATURE_DISABLED(kAutomaticLazyFrameLoadingToEmbedUrls);
 --
@@ -0,0 +1,82 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 30 Jul 2024 14:38:58 +0000
+Subject: Bubble Locking on UI DevTools
+
+Allows the use of ctrl+shift+click on the refresh button to
+activate the Bubble Locking mode for the native dev-ui.
+The current ctrl+shift+R is really inconvenient and often does not work.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../browser/ui/views/toolbar/reload_button.cc |  8 ++++++
+ ui/views/widget/widget.h                      | 25 ++++++++++---------
+ 2 files changed, 21 insertions(+), 12 deletions(-)
+
+diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
+--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
+@@ -225,6 +225,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
+       command = IDC_RELOAD;
+     }
+ 
+    views::Widget::SetDisableActivationChangeHandling(
+        views::Widget::DisableActivationChangeHandlingType::kNone);
+    if (event.IsShiftDown() && event.IsControlDown()) {
+      views::Widget::SetDisableActivationChangeHandling(
+        views::Widget::DisableActivationChangeHandlingType::kIgnoreDeactivationOnly);
+      return;
+    }
+
+     // Start a timer - while this timer is running, the reload button cannot be
+     // changed to a stop button.  We do not set |intended_mode_| to Mode::kStop
+     // here as the browser will do that when it actually starts loading (which
+diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
+--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
+@@ -1479,6 +1479,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   // initialized.
+   void SaveWindowPlacementIfNeeded();
+ 
+  // Type of ways to ignore activation changes.
+  enum class DisableActivationChangeHandlingType {
+    kNone = 0,  // Don't ignore any activation changes.
+    kIgnore,    // Ignore both activation and deactivation changes.
+    kIgnoreDeactivationOnly,  // Ignore only deactivation changes.
+  };
+
+  // Sets/gets the type of disabling widget activation change handling.
+  static void SetDisableActivationChangeHandling(
+      DisableActivationChangeHandlingType new_type) {
+    g_disable_activation_change_handling_ = new_type;
+  }
+
+  protected:
+   // Creates the RootView to be used within this Widget. Subclasses may override
+   // to create custom RootViews that do specialized event processing.
+@@ -1519,13 +1532,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   void set_widget_closed() { widget_closed_ = true; }
+ 
+  private:
+-  // Type of ways to ignore activation changes.
+-  enum class DisableActivationChangeHandlingType {
+-    kNone = 0,  // Don't ignore any activation changes.
+-    kIgnore,    // Ignore both activation and deactivation changes.
+-    kIgnoreDeactivationOnly,  // Ignore only deactivation changes.
+-  };
+-
+   class PaintAsActiveLockImpl;
+ 
+   friend class ButtonTest;
+@@ -1536,11 +1542,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   friend class ui_devtools::BubbleLocking;
+   friend void DisableActivationChangeHandlingForTests();
+ 
+-  // Sets/gets the type of disabling widget activation change handling.
+-  static void SetDisableActivationChangeHandling(
+-      DisableActivationChangeHandlingType new_type) {
+-    g_disable_activation_change_handling_ = new_type;
+-  }
+   static DisableActivationChangeHandlingType
+   GetDisableActivationChangeHandling() {
+     return g_disable_activation_change_handling_;
+--
@@ -6,7 +6,7 @@ In site settings added ability to block all popups per site

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../tab_under_navigation_throttle.cc          |   1 +
+ .../tab_under_navigation_throttle.cc          |  11 +-
 .../android/popup_blocked_message_delegate.cc |  20 +++-
 .../android/popup_blocked_message_delegate.h  |   1 +
 components/blocked_content/popup_blocker.cc   |   3 +
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../bromite_content_settings/popups.grdp      |  12 ++
 .../bromite_content_settings/popups.inc       |   8 ++
 .../core/browser/content_settings_registry.cc |   2 +-
- 9 files changed, 153 insertions(+), 3 deletions(-)
+ 9 files changed, 160 insertions(+), 6 deletions(-)
 create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromitePopupContentSetting.java
 create mode 100644 components/browser_ui/strings/bromite_content_settings/popups.grdp
 create mode 100644 components/content_settings/core/browser/bromite_content_settings/popups.inc
@@ -23,14 +23,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
-@@ -72,6 +72,7 @@ void LogTabUnderAttempt(content::NavigationHandle* handle) {
- BASE_FEATURE(kBlockTabUnders,
-              "BlockTabUnders",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+SET_CROMITE_FEATURE_ENABLED(kBlockTabUnders);
+@@ -143,9 +143,14 @@ TabUnderNavigationThrottle::MaybeBlockNavigation() {
 
- // static
- std::unique_ptr<content::NavigationThrottle>
+   LogTabUnderAttempt(navigation_handle());
+ 
+-  // We unconditionally proceed. There used to be a tab-under blocking
+-  // experiment, but it never launched.
+-  return content::NavigationThrottle::PROCEED;
+  content::WebContents* web_contents = navigation_handle()->GetWebContents();
+  const std::string error =
+      base::StringPrintf(kBlockTabUnderFormatMessage,
+                          navigation_handle()->GetURL().spec().c_str());
+  web_contents->GetPrimaryMainFrame()->AddMessageToConsole(
+      blink::mojom::ConsoleMessageLevel::kError, error.c_str());
+  ShowUI();
+  return content::NavigationThrottle::CANCEL;
+ }
+ 
+ void TabUnderNavigationThrottle::ShowUI() {
 diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
 --- a/components/blocked_content/android/popup_blocked_message_delegate.cc
 +++ b/components/blocked_content/android/popup_blocked_message_delegate.cc
@@ -150,7 +160,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -163,8 +173,8 @@ new file mode 100644
 +public class BromitePopupContentSetting extends BromiteCustomContentSetting {
 +    public BromitePopupContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.POPUPS,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*defaultEnabledValue*/ ContentSetting.ALLOW,
+              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "popups",
 +              /*profilePrefKey*/ "popups");
@@ -183,13 +193,13 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
+            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_popup_allowed;
-+            case ContentSettingValues.BLOCK:
+            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_popup_blocked;
-+            case ContentSettingValues.ASK:
+            case ContentSetting.ASK:
 +                return R.string.website_settings_category_popup_block_all;
 +            default:
 +                return 0;
@@ -226,8 +236,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return ContentSettingValues.ALLOW != value;
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
+        return ContentSetting.ALLOW != value;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/popups.grdp b/components/browser_ui/strings/bromite_content_settings/popups.grdp
@@ -263,7 +273,7 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -134,7 +134,7 @@ void ContentSettingsRegistry::Init() {
+@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() {
            WebsiteSettingsInfo::SYNCABLE,
            /*allowlisted_primary_schemes=*/
            {kChromeUIScheme, kChromeDevToolsScheme, kExtensionScheme},
@@ -9,13 +9,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 services/network/cors/preflight_controller.cc | 4 ++++
 services/network/cors/preflight_controller.h  | 2 ++
 services/network/cors/preflight_result.cc     | 2 +-
- services/network/network_context.cc           | 2 ++
- 6 files changed, 15 insertions(+), 1 deletion(-)
+ services/network/network_context.cc           | 1 +
+ 6 files changed, 14 insertions(+), 1 deletion(-)

 diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc
 --- a/services/network/cors/preflight_cache.cc
 +++ b/services/network/cors/preflight_cache.cc
-@@ -200,6 +200,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
+@@ -204,6 +204,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
   MayPurge(max_entries, purge_unit);
 }
 
@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
 diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
 --- a/services/network/cors/preflight_controller.cc
 +++ b/services/network/cors/preflight_controller.cc
-@@ -811,6 +811,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -762,6 +762,10 @@ void PreflightController::ClearCorsPreflightCache(
   cache_.ClearCache(std::move(url_filter));
 }
 
@@ -51,11 +51,11 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co
 +
 void PreflightController::RemoveLoader(PreflightLoader* loader) {
   auto it = loaders_.find(loader);
-   DCHECK(it != loaders_.end());
+   CHECK(it != loaders_.end());
 diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
 --- a/services/network/cors/preflight_controller.h
 +++ b/services/network/cors/preflight_controller.h
-@@ -157,6 +157,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
+@@ -151,6 +151,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
           url_loader_network_service_observer,
       const PreflightMode& preflight_mode);
 
@@ -79,13 +79,12 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1186,6 +1186,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
-       base::BindOnce(&NetworkContext::OnHttpCacheCleared,
-                      base::Unretained(this), std::move(callback))));
- 
+@@ -1372,6 +1372,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+                                     base::Time end_time,
+                                     mojom::ClearDataFilterPtr filter,
+                                     ClearHttpCacheCallback callback) {
 +  cors_preflight_controller_.ClearCache();
-+
-   NetworkServiceMemoryCache* memory_cache = GetMemoryCache();
-   if (memory_cache)
-     memory_cache->Clear();
+   // It's safe to use Unretained below as the HttpCacheDataRemover is owned by
+   // |this| and guarantees it won't call its callback if deleted.
+   http_cache_data_removers_.push_back(HttpCacheDataRemover::CreateAndStart(
 --
@@ -7,22 +7,22 @@ Use Google Chrome branding for client hints

 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 ++++--
- .../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(-)
+ components/embedder_support/user_agent_utils.cc   |  4 +---
+ content/browser/client_hints/client_hints.cc      | 15 ++++++++++-----
+ .../browser/loader/navigation_url_loader_impl.cc  |  5 +++++
+ .../about_flags_cc/Client-hints-overrides.inc     |  9 +++++++++
+ .../common/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 ++++--
+ .../common/client_hints/enabled_client_hints.cc   |  6 ++++++
+ .../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/frame_fetch_context.cc   |  4 +++-
+ .../platform/runtime_enabled_features.json5       |  8 ++++++--
+ 15 files changed, 56 insertions(+), 15 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
 create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
 --- a/components/embedder_support/user_agent_utils.cc
 +++ b/components/embedder_support/user_agent_utils.cc
-@@ -187,9 +187,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -202,9 +202,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
   bool parse_result = base::StringToInt(major_version, &major_version_number);
   DCHECK(parse_result);
   std::optional<std::string> brand;
@@ -38,31 +38,21 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 -  brand = version_info::GetProductName();
 -#endif
 +  brand = "Google Chrome";
-   std::optional<std::string> maybe_brand_override =
-       base::GetFieldTrialParamValueByFeature(features::kGreaseUACH,
-                                              "brand_override");
+ 
+   std::string brand_version =
+       output_version_type == blink::UserAgentBrandVersionType::kFullVersion
 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
-@@ -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"
+@@ -57,6 +57,7 @@
+ #include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/common/page/page_zoom.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
 +#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "url/origin.h"
-@@ -516,7 +517,8 @@ void AddPrefersReducedTransparencyHeader(net::HttpRequestHeaders* headers,
-                         : network::kPrefersReducedTransparencyNoPreference);
- }
- 
-bool IsValidURLForClientHints(const url::Origin& origin) {
-+bool IsValidURLForClientHints(const url::Origin& origin) { // disabled in Bromite
-+  if ((true)) return false;
-   return network::IsOriginPotentiallyTrustworthy(origin);
- }
- 
-@@ -718,7 +720,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
+@@ -705,7 +706,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
     // value, disable them. This overwrites previous decision from UI.
     disable_due_to_custom_ua = !ua_metadata.has_value();
   }
@@ -72,27 +62,35 @@ 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();
-@@ -900,10 +903,12 @@ void AddRequestClientHintsHeaders(
+@@ -897,10 +899,12 @@ void AddRequestClientHintsHeaders(
     AddEctHeader(headers, network_quality_tracker, url);
   }
 
 -  UpdateNavigationRequestClientUaHeadersImpl(
 -      delegate, is_ua_override_on, frame_tree_node,
-      ClientUaHeaderCallType::kDuringCreation, headers, container_policy,
-      request_url, data);
+-      ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data,
+-      ftn_for_devtools_override);
 +  if (blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) {
 +    UpdateNavigationRequestClientUaHeadersImpl(
 +        delegate, is_ua_override_on, frame_tree_node,
-+        ClientUaHeaderCallType::kDuringCreation, headers, container_policy,
-+        request_url, data);
+        ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data,
+        ftn_for_devtools_override);
 +  }
 
   if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
     AddPrefersColorSchemeHeader(headers, frame_tree_node);
+@@ -988,6 +992,7 @@ ParseAndPersistAcceptCHForNavigation(
+     BrowserContext* context,
+     ClientHintsControllerDelegate* delegate,
+     FrameTreeNode* frame_tree_node) {
+  if ((true)) return std::nullopt;
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK(context);
+   DCHECK(parsed_headers);
 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
-@@ -1185,6 +1185,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1737,6 +1737,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
     return;
   }
 
@@ -133,7 +131,7 @@ new file mode 100644
 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
 --- a/net/http/http_network_transaction.cc
 +++ b/net/http/http_network_transaction.cc
-@@ -102,6 +102,7 @@ const size_t kMaxRestarts = 32;
+@@ -111,6 +111,7 @@ const size_t kMaxRestarts = 32;
 
 // Returns true when Early Hints are allowed on the given protocol.
 bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -144,7 +142,7 @@ diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transa
 diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc
 --- a/services/network/public/cpp/client_hints.cc
 +++ b/services/network/public/cpp/client_hints.cc
-@@ -120,6 +120,7 @@ const DecodeMap& GetDecodeMap() {
+@@ -112,6 +112,7 @@ const DecodeMap& GetDecodeMap() {
 
 std::optional<std::vector<network::mojom::WebClientHintsType>>
 ParseClientHintsHeader(const std::string& header) {
@@ -158,12 +156,12 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
@@ -14,6 +14,7 @@
 #include "base/strings/string_util.h"
 #include "services/network/public/cpp/client_hints.h"
+ #include "services/network/public/cpp/permissions_policy/client_hints_permissions_policy_mapping.h"
+#include "third_party/blink/public/common/features_generated.h"
+ #include "services/network/public/cpp/permissions_policy/permissions_policy.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() {
+@@ -22,11 +23,12 @@ namespace blink {
 
 bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
   switch (type) {
@@ -172,7 +170,7 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
     case network::mojom::WebClientHintsType::kUAMobile:
     case network::mojom::WebClientHintsType::kUAPlatform:
 -      return true;
-+      return RuntimeEnabledFeatures::UserAgentClientHintEnabled();
+      return base::FeatureList::IsEnabled(blink::features::kUserAgentClientHint);
 +    case network::mojom::WebClientHintsType::kSaveData:
 +      return false;
     default:
@@ -181,31 +179,19 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
 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
-@@ -15,6 +15,7 @@ namespace {
+@@ -15,6 +15,12 @@ namespace {
 using ::network::mojom::WebClientHintsType;
 
 bool IsDisabledByFeature(const WebClientHintsType type) {
+  if (type == WebClientHintsType::kUA ||
+        type == WebClientHintsType::kUAMobile ||
+        type == WebClientHintsType::kUAPlatform) {
+    return false;
+  }
 +  if ((true)) return true;
   switch (type) {
     case WebClientHintsType::kUA:
     case WebClientHintsType::kUAArch:
-@@ -96,7 +97,7 @@ bool IsDisabledByFeature(const WebClientHintsType type) {
- }  // namespace
- 
- bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const {
-  return enabled_types_[static_cast<int>(type)];
-+  return false;
- }
- 
- void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
-@@ -107,6 +108,7 @@ void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
- 
- std::vector<WebClientHintsType> EnabledClientHints::GetEnabledHints() const {
-   std::vector<WebClientHintsType> hints;
-+  if ((true)) return hints;
-   for (const auto& elem : network::GetClientHintToNameMap()) {
-     const auto& type = elem.first;
-     if (IsEnabled(type))
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_party/blink/renderer/core/frame/navigator_ua.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua.idl
@@ -222,14 +208,14 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -219,6 +219,7 @@ ScriptPromise<UADataValues> NavigatorUAData::getHighEntropyValues(
-   Dactyloscoper::RecordDirectSurface(
-       GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform());
+@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const {
+ }
 
-+  if ((false))
-   for (const String& hint : hints) {
-     if (hint == "platformVersion") {
-       values->setPlatformVersion(platform_version_);
+ bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
+  if ((true)) return false;
+   // To determine whether a document is allowed to use the get high-entropy
+   // client hints returned by navigator.userAgentData.getHighEntropyValues(),
+   // check the following:
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
@@ -245,42 +231,33 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third
   [HighEntropy, MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
   [HighEntropy=Direct, MeasureAs=NavigatorUAData_Mobile]  readonly attribute boolean mobile;
   [HighEntropy=Direct, MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
-diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/third_party/blink/renderer/core/loader/base_fetch_context.cc
--- a/third_party/blink/renderer/core/loader/base_fetch_context.cc
-+++ b/third_party/blink/renderer/core/loader/base_fetch_context.cc
-@@ -167,7 +167,7 @@ void BaseFetchContext::AddClientHintsIfNecessary(
-   // specifying accomponying client hints, in which case we disable sending
-   // them.
-   using network::mojom::blink::WebClientHintsType;
-  if (ua) {
-+  if (RuntimeEnabledFeatures::UserAgentClientHintEnabled() && ua) {
-     // ShouldSendClientHint is called to make sure UA is controlled by
-     // Permissions Policy.
-     if (ShouldSendClientHint(policy, resource_origin, is_1p_origin,
-@@ -329,7 +329,7 @@ void BaseFetchContext::AddClientHintsIfNecessary(
+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
+@@ -227,6 +227,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
+                           bool is_1p_origin,
+                           network::mojom::blink::WebClientHintsType type,
+                           const ClientHintsPreferences& hints_preferences) {
+  if (!RuntimeEnabledFeatures::UserAgentClientHintEnabled())
+    return false;
+   // For subresource requests, sending the hint in the fetch request based on
+   // the permissions policy.
+   if (!policy.IsFeatureEnabledForOrigin(
+@@ -630,7 +632,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
   }
 
   // Only send User Agent hints if the info is available
 -  if (ua) {
 +  if (RuntimeEnabledFeatures::UserAgentClientHintEnabled() && ua) {
-     if (ShouldSendClientHint(policy, resource_origin, is_1p_origin,
-                              WebClientHintsType::kUAArch, hints_preferences)) {
-       SetHttpHeader(WebClientHintsType::kUAArch,
-@@ -652,6 +652,8 @@ bool BaseFetchContext::ShouldSendClientHint(
-     bool is_1p_origin,
-     network::mojom::blink::WebClientHintsType type,
-     const ClientHintsPreferences& hints_preferences) const {
-+  if (!RuntimeEnabledFeatures::UserAgentClientHintEnabled())
-+    return false;
-   // For subresource requests, sending the hint in the fetch request based on
-   // the permissions policy.
-   if ((!policy ||
+     // ShouldSendClientHint is called to make sure UA is controlled by
+     // Permissions Policy.
+     if (ShouldSendClientHint(*policy, resource_origin, is_1p_origin,
 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
-@@ -340,6 +340,11 @@
-       name: "AtomicMoveOverride",
-       // No "status" field, so that this is not enabled on WPTs by default.
+@@ -551,6 +551,11 @@
+       name: "AriaNotifyV2",
+       status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
     },
 +    {
 +      name: "UserAgentClientHint",
@@ -288,6 +265,16 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      base_feature: "UserAgentClientHint",
 +    },
     {
-       name: "AttributionReporting",
-       origin_trial_feature_name: "PrivacySandboxAdsAPIs",
+       name: "AriaRowColIndexText",
+       status: "stable",
+@@ -946,8 +951,7 @@
+       // Allows top-level sites to restrict collection of high-entropy UA client
+       // hints (from 3Ps, or itself) via the getHighEntropyValues API.
+       // crbug.com/385161047
+-      name: "ClientHintUAHighEntropyValuesPermissionPolicy",
+-      status: "test",
+      name: "ClientHintUAHighEntropyValuesPermissionPolicy",  // disabled by default
+     },
+     {
+       // Enables clipboardchange event API for listening for changes to the
 --
@@ -0,0 +1,100 @@
+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        | 12 ++++--------
+ .../about_flags_cc/Close-Sessions-On-Ip-Change.inc | 14 ++++++++++++++
+ .../features_cc/Close-Sessions-On-Ip-Change.inc    |  5 +++++
+ .../features_h/Close-Sessions-On-Ip-Change.inc     |  3 +++
+ net/base/features.cc                               |  2 +-
+ 5 files changed, 27 insertions(+), 9 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
+ create mode 100644 cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
+ create mode 100644 cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
+
+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
+@@ -221,9 +221,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(
+@@ -304,11 +303,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),
+-      "true");
+  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
+@@ -495,7 +495,7 @@ BASE_FEATURE(RelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
+ // 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
-@@ -663,6 +663,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -677,6 +677,7 @@ template("chrome_common_apk_or_module_tmpl") {
           [ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
       loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
       library_always_compress += [ "libchrome_crashpad_handler.so" ]
@@ -0,0 +1,296 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 21 Sep 2024 15:32:02 +0000
+Subject: Cromite Branding: improve settings ui
+
+Modification to the settings ui with the aim of making it clearer.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/android/chrome_java_resources.gni      |   2 +-
+ .../android/java/res/xml/main_preferences.xml |   4 +-
+ .../res/xml/privacy_preferences_cromite.xml   | 197 ++++++++++++++++++
+ .../privacy/settings/PrivacySettings.java     |   6 +-
+ .../Cromite-settings-ui.grdp                  |  15 ++
+ 5 files changed, 219 insertions(+), 5 deletions(-)
+ create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+
+diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
+--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
+@@ -638,7 +638,7 @@ chrome_java_resources = [
+   "java/res/xml/manage_sync_preferences.xml",
+   "java/res/xml/personalize_google_services_preferences.xml",
+   "java/res/xml/incognito_preferences.xml",
+-  "java/res/xml/privacy_preferences.xml",
+  "java/res/xml/privacy_preferences.xml", "java/res/xml/privacy_preferences_cromite.xml",
+   "java/res/xml/referer_policy_preferences.xml",
+   "java/res/layout/radio_button_group_referer_policy_preference.xml",
+   "java/res/xml/search_widget_info.xml",
+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
+@@ -11,7 +11,7 @@ found in the LICENSE file.
+ <!-- `order=0` is reserved and it will be added in code.  -->
+ <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
+     <PreferenceCategory
+-        android:key="account_and_google_services_section"
+        android:key="account_and_google_services_section" app:isPreferenceVisible="false"
+         android:order="1001"
+         android:title="@string/prefs_section_account_and_google_services"/>
+     <org.chromium.chrome.browser.sync.settings.SignInPreference
+@@ -24,7 +24,7 @@ found in the LICENSE file.
+         android:layout="@layout/account_management_account_row"
+         android:title="@string/sync_category_title"/>
+     <org.chromium.components.browser_ui.settings.ChromeBasePreference
+-        android:key="google_services"
+        android:key="google_services" app:isPreferenceVisible="false"
+         android:order="1004"
+         android:layout="@layout/account_management_account_row"
+         android:title="@string/prefs_google_services"
+diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
+@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2022 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/browsing_data_section_title"/>
+    <Preference
+        android:key="clear_browsing_data"
+        android:title="@string/clear_browsing_data_title"
+        android:summary="@string/clear_browsing_data_summary"
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
+    <Preference
+        android:key="clear_browsing_data_advanced"
+        android:title="@string/clear_browsing_data_at_start_title"
+        android:summary="@string/clear_browsing_data_at_start_summary"
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAtStart" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="close_tabs_on_exit"
+        android:title="@string/close_tabs_on_exit_title"
+        android:summary="@string/close_tabs_on_exit_summary"
+        android:defaultValue="false" />
+    <org.chromium.components.browser_ui.settings.SpinnerPreference
+        android:key="history_expire_days_threshold"
+        android:persistent="false"
+        android:title="@string/history_expire_days_threshold_title"
+        android:summary="@string/history_expire_days_threshold_summary"
+        app:singleLine="true" />
+
+    <PreferenceCategory
+        android:title="@string/data_exposed_to_website_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
+        android:key="third_party_cookies"
+        android:title="@string/third_party_cookies_link_row_label"
+        android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings" />
+    <Preference
+        android:key="do_not_track"
+        android:title="@string/do_not_track_title"
+        android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
+    <Preference
+        android:key="gpc"
+        android:title="@string/gpc_title"
+        android:fragment="org.chromium.chrome.browser.privacy.settings.GpcSettings" />
+    <Preference
+        android:key="referers_policy"
+        android:title="@string/referers_policy_title"
+        android:fragment="org.chromium.chrome.browser.privacy.settings.RefererSettingsFragment"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="can_make_payment"
+        android:title="@string/can_make_payment_title"
+        android:summary="@string/settings_can_make_payment_toggle_label" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="throttle_main_thread_to_60hz"
+        android:title="@string/throttle_main_thread_to_60hz_title"
+        android:summary="@string/throttle_main_thread_to_60hz_summary"
+        app:featureName="throttle-main-thread-to-60hz"
+        app:needRestart="true" />
+
+    <PreferenceCategory
+        android:title="@string/data_exposed_to_device_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="allow_custom_tab_intents"
+        android:title="@string/allow_custom_tab_intents_title"
+        android:summary="@string/allow_custom_tab_intents_summary"
+        android:defaultValue="false" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:title="@string/uses_separate_storagepartition_for_cct_title"
+        android:summary="@string/uses_separate_storagepartition_for_cct_summary"
+        app:featureName="maylaunchurl-uses-separate-storage-partition"
+        app:needRestart="true" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="allow_external_intent_requests"
+        android:title="@string/allow_external_intent_requests_title"
+        android:summary="@string/allow_external_intent_requests_summary"
+        app:featureName="AllowExternalIntentRequests"
+        app:needRestart="false" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="use_tab_switcher_list_mode"
+        android:title="@string/tab_switcher_list_mode_title"
+        android:summary="@string/tab_switcher_list_mode_summary"
+        app:featureName="TabSwitcherListMode"
+        app:needRestart="true" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="tabgrid_use_icons"
+        android:title="@string/tabgrid_use_icons_title"
+        android:summary="@string/tabgrid_use_icons_summary"
+        android:defaultValue="false" />
+
+    <PreferenceCategory
+        android:title="@string/incognito_related_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="open_external_links_incognito"
+        android:title="@string/open_external_links_incognito_title"
+        android:summary="@string/open_external_links_incognito_summary"
+        android:defaultValue="false" />
+    <org.chromium.chrome.browser.incognito.reauth.IncognitoReauthSettingSwitchPreference
+        android:key="incognito_lock"
+        android:title="@string/settings_incognito_tab_lock_title"
+        android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
+        android:persistent="false" />
+    <Preference
+        android:key="incognito_settings"
+        android:title="@string/incognito_settings_title"
+        android:summary="@string/incognito_settings_summary"
+        android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
+
+    <PreferenceCategory
+        android:key="security_section"
+        android:title="@string/security_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="https_first_mode_legacy"
+        android:title="@string/settings_https_first_mode_title"
+        android:summary="@string/settings_https_first_mode_summary" />
+    <Preference
+        android:key="https_first_mode"
+        android:title="@string/settings_https_first_mode_title"
+        android:fragment="org.chromium.chrome.browser.ssl.HttpsFirstModeSettingsFragment" />
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
+        android:key="secure_dns"
+        android:title="@string/settings_secure_dns_title"
+        android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
+
+    <PreferenceCategory
+        android:title="@string/services_category_title"/>
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+        android:key="proxy"
+        android:title="@string/proxy_title"
+        app:url="@string/proxy_url" />
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+        android:key="cromite_flags"
+        android:title="@string/cromite_flags_title"
+        app:url="@string/cromite_flags_url" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="search_suggestions"
+        android:title="@string/improve_search_suggestions_title"
+        android:summary="@string/improve_search_suggestions_summary"
+        android:persistent="false"/>
+
+    <!--Always hidden-->
+    <org.chromium.chrome.browser.safety_hub.SafetyHubExpandablePreference
+        android:key="advanced_protection_info"
+        android:title="@string/settings_privacy_and_security_advanced_protection_section_title"
+        app:isPreferenceVisible="false" />
+    <Preference
+        android:key="safe_browsing"
+        android:title="@string/prefs_safe_browsing_title"
+        android:summary="@string/prefs_safe_browsing_summary"
+        android:fragment="org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragment"
+        app:isPreferenceVisible="false" />
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
+        android:key="contextual_search"
+        android:title="@string/contextual_search_title"
+        android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchSettingsFragment"
+        app:isPreferenceVisible="false" />
+    <Preference
+        android:key="privacy_guide"
+        app:isPreferenceVisible="false"
+        android:title="@string/privacy_guide_pref_title"
+        android:summary="@string/privacy_guide_pref_summary"
+        android:fragment="org.chromium.chrome.browser.privacy_guide.PrivacyGuideFragment" />
+    <Preference
+        android:key="tracking_protection"
+        android:title="@string/third_party_cookies_link_row_label"
+        android:fragment="org.chromium.components.privacy_sandbox.TrackingProtectionSettings"
+        app:isPreferenceVisible="false" />
+    <Preference
+        android:key="incognito_tracking_protections"
+        android:title="@string/incognito_tracking_protections_link_row_label"
+        android:summary="@string/incognito_tracking_protections_link_row_sublabel"
+        android:fragment="org.chromium.components.privacy_sandbox.IncognitoTrackingProtectionsFragment"
+        app:isPreferenceVisible="false" />
+    <Preference
+        android:key="privacy_sandbox"
+        android:title="@string/ad_privacy_link_row_label"
+        android:summary="@string/ad_privacy_link_row_sub_label"
+        android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment" />
+    <Preference
+        android:key="preload_pages"
+        android:title="@string/preload_pages_title"
+        android:summary="@string/preload_pages_summary"
+        android:fragment="org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment"
+        app:isPreferenceVisible="false" />
+    <org.chromium.components.browser_ui.settings.TextMessagePreference
+        android:key="sync_and_services_link"
+        android:summary="@string/privacy_sync_and_services_link_legacy"
+        app:allowDividerBelow="false"
+        app:isPreferenceVisible="false" />
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
+        android:key="javascript_optimizer"
+        android:title="@string/website_settings_privacy_and_security_javascript_optimizer_row_label"
+        android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
+        app:isPreferenceVisible="false" />
+</PreferenceScreen>
+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
+@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+         mPageTitle.set(getString(R.string.prefs_privacy_security));
+ 
+-        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
+ 
+         Preference incognitoTrackingProtectionsPreference =
+                 findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
+@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+ 
+         ChromeSwitchPreference passwordLeakTogglePref =
+                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
+-        passwordLeakTogglePref.setOnPreferenceChangeListener(this);
+        if (passwordLeakTogglePref != null) {
+                passwordLeakTogglePref.setVisible(false);
+        }
+ 
+         mSearchSuggestions = (ChromeSwitchPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+         mSearchSuggestions.setOnPreferenceChangeListener(this);
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_BROWSING_DATA_SECTION_TITLE" desc="">
+        Browsing data
+    </message>
+    <message name="IDS_DATA_EXPOSED_TO_WEBSITE_SECTION_TITLE" desc="">
+        Data exposed to the websites
+    </message>
+    <message name="IDS_INCOGNITO_RELATED_SECTION_TITLE" desc="">
+        Incognito mode
+    </message>
+    <message name="IDS_DATA_EXPOSED_TO_DEVICE_SECTION_TITLE" desc="">
+        Data exposed in the device
+    </message>
+</grit-part>
+--
@@ -25,8 +25,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../mipmap-xxxhdpi/app_icon.png               | Bin 9667 -> 20837 bytes
 .../mipmap-xxxhdpi/layered_app_icon.png       | Bin 3652 -> 29220 bytes
 .../layered_app_icon_background.png           | Bin 3519 -> 142032 bytes
- .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
- .../inline/BromiteInlineUpdateController.java |  21 +++-
+ .../values/channel_constants.xml              |   8 +-
+ .../ChromeContextMenuPopulator.java           |   2 +-
+ .../browser/fullscreen/FullscreenToast.java   |   2 +-
+ .../inline/BromiteInlineUpdateController.java |  19 +++-
 chrome/app/extensions_strings.grdp            |   4 +-
 chrome/app/settings_strings.grdp              |   2 +-
 chrome/app/theme/chromium/BRANDING            |   8 +-
@@ -35,11 +37,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../theme/chromium/win/tiles/SmallLogo.png    | Bin 9784 -> 12363 bytes
 .../chromium/product_logo_32.png              | Bin 822 -> 2301 bytes
 chrome/browser/BUILD.gn                       |   1 +
+ .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
+ chrome/browser/prefs/BUILD.gn                 |   1 +
 .../prefs/chrome_pref_service_factory.cc      |   6 +-
 .../profiles/profile_shortcut_manager_win.cc  |   2 +-
- .../settings/settings_menu/settings_menu.html |   5 +-
+ .../settings/settings_menu/settings_menu.html |  14 ++-
+ .../OmniboxSuggestionsContainer.java          |   8 +-
 .../strings/android_chrome_strings.grd        |   2 +-
+ .../toolbar/chrome_labs/chrome_labs_utils.cc  |   1 +
 chrome/common/url_constants.h                 |   4 +-
+ .../install_static/chromium_install_modes.cc  |   2 +-
 .../strings/android/browser_ui_strings.grd    |   2 +-
 .../drawable-hdpi/fre_product_logo.png        | Bin 3912 -> 22295 bytes
 .../drawable-mdpi/fre_product_logo.png        | Bin 2490 -> 12171 bytes
@@ -51,15 +58,19 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
 .../chromium/product_logo.png                 | Bin 2714 -> 7923 bytes
 .../chromium/product_logo_white.png           | Bin 2512 -> 6790 bytes
+ .../webui/version/resources/about_version.ts  |   4 +-
+ .../resources/about_version_mobile.css        |   9 ++
+ content/child/runtime_features.cc             |  44 ++++-----
+ .../Cromite-Branding.inc                      |   1 +
 tools/grit/grit/grd_reader.py                 |  35 +++++++
- ui/base/ui_base_features.cc                   |   2 +
- 49 files changed, 155 insertions(+), 100 deletions(-)
+ 59 files changed, 210 insertions(+), 132 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc

 diff --git a/build/BUILD.gn b/build/BUILD.gn
 --- a/build/BUILD.gn
 +++ b/build/BUILD.gn
-@@ -55,6 +55,14 @@ buildflag_header("branding_buildflags") {
-   }
+@@ -56,6 +56,14 @@ buildflag_header("branding_buildflags") {
+   flags += [ "ENABLE_BUILTIN_SEARCH_PROVIDER_ASSETS=$enable_builtin_search_provider_assets" ]
 }
 
 +buildflag_header("cromite_buildflags") {
@@ -76,8 +87,8 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -183,6 +183,10 @@ declare_args() {
-   clang_unsafe_buffers_paths = ""
+@@ -187,6 +187,10 @@ declare_args() {
+   clang_warning_suppression_file = ""
 }
 
 +declare_args() {
@@ -90,7 +101,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -174,7 +174,7 @@ by a child template that "extends" this file.
+@@ -189,7 +189,7 @@ by a child template that "extends" this file.
       <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
         android:icon="@drawable/ic_launcher"
         android:roundIcon="@drawable/ic_launcher_round"
@@ -122,8 +133,8 @@ diff --git a/chrome/android/java/res/xml/legal_information_preferences.xml b/chr
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -14,20 +14,20 @@ found in the LICENSE file.
-         android:order="0"/>
+@@ -12,20 +12,20 @@ found in the LICENSE file.
+ <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
     <PreferenceCategory
         android:key="account_and_google_services_section"
 -        android:order="1"
@@ -146,7 +157,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 +        android:order="1004"
         android:layout="@layout/account_management_account_row"
         android:title="@string/prefs_google_services"
-         android:icon="@drawable/ic_google_services_48dp"
+         android:icon="@drawable/ic_google_services_48dp_with_bg"
 diff --git a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
 --- a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
 +++ b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
@@ -9112,22 +9123,51 @@ zk0U>@{Db0uvVi{o$%=-6@&Jp4mhhHYo~{+5O$ZdgIR*B?vJ5$!R3PXBkQ0>lqcPjJ
 zG!=nXw2&abs#xr~fFDF!vq@X7`+qtd5cw$r{cp#9R6!ToGG#p=PkT1k)Wlt8^P%Pg
 W=g!Ha2?pSwIRxeC=1^|uclqCxqvpf_

-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
-@@ -37,7 +37,7 @@ public class UpdateConfigs {
-     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
-     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
+diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml b/chrome/android/java/res_chromium_base/values/channel_constants.xml
+--- a/chrome/android/java/res_chromium_base/values/channel_constants.xml
+++ b/chrome/android/java/res_chromium_base/values/channel_constants.xml
+@@ -7,8 +7,8 @@ found in the LICENSE file.
 
-    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS;
-+    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 1 * DateUtils.DAY_IN_MILLIS;
-     private static final long DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS = 2 * DateUtils.DAY_IN_MILLIS;
+ <resources xmlns:android="http://schemas.android.com/apk/res/android">
+     <!-- The application name displayed to the user. -->
+-    <string name="app_name" translatable="false">Chromium</string>
+-    <string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string>
+-    <string name="search_widget_title" translatable="false">Chromium search</string>
+-    <string name="quick_action_search_widget_title" translatable="false">Chromium quick action search</string>
+    <string name="app_name" translatable="false">Cromite</string>
+    <string name="bookmark_widget_title" translatable="false">Cromite bookmarks</string>
+    <string name="search_widget_title" translatable="false">Cromite search</string>
+    <string name="quick_action_search_widget_title" translatable="false">Cromite quick action search</string>
+ </resources>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+@@ -454,8 +454,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+                     && !isEmptyUrl(mParams.getUrl())
+                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
+                 if (mMode == ContextMenuMode.NORMAL) {
+-                    linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
+                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
+                    linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
+                     if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
+                         linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
+                     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
+@@ -109,7 +109,7 @@ interface FullscreenToast {
+             mNotificationToast =
+                     Toast.makeTextWithPriority(
+                             mActivity, toastTextId, Toast.LENGTH_LONG, ToastPriority.HIGH);
+-            mNotificationToast.setGravity(Gravity.BOTTOM | Gravity.CENTER, 0, 0);
+            mNotificationToast.setGravity(Gravity.TOP | Gravity.CENTER, 0, 0);
+             mNotificationToast.show();
+         }
 
-     /** Possible update flow configurations. */
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
-@@ -61,10 +61,10 @@ import org.chromium.chrome.browser.omaha.VersionNumber;
+@@ -62,10 +62,10 @@ import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse;
 public class BromiteInlineUpdateController implements InlineUpdateController {
 
     private static final String TAG = "BromiteInlineUpdateController";
@@ -9140,9 +9180,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 +    private final String UPSTREAM_VERSION_URL = "";
 +    public static final String VULNERABLE_VERSION_DOC_URL = "";
 
-     public static String getDownloadUrl() {
-         return UPDATE_VERSION_URL + BuildConfig.BUILD_TARGET_CPU + "_ChromePublic.apk";
-@@ -213,11 +213,20 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
+     @Override
+     public String getDownloadUrl() {
+@@ -223,6 +223,13 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
                         Log.i(TAG, "BromiteUpdater: obtained response '%s' and redirect URL '%s'", endpointResponse.getResponseString(), redirectURL);
                         if (redirectURL.indexOf(REDIRECT_URL_PREFIX) == 0) {
                             redirectURL = redirectURL.substring(REDIRECT_URL_PREFIX.length());
@@ -9156,14 +9196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
                             String[] parts = redirectURL.split(Pattern.quote("/"));
                             if (parts.length > 0) {
                                 VersionNumber version = VersionNumber.fromString(parts[0]);
-                                 if (version != null) {
-                                     versionFound = true;
-+                                    if (UPSTREAM_VERSION_URL.equals(""))
-+                                        OmahaBase.updateLastPushedTimeStamp(System.currentTimeMillis());
-                                     OmahaBase.setLatestModifiedVersion(parts[0]);
-                                     callback.onResult(version);
-                                     return;
-@@ -240,6 +249,10 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
+@@ -252,6 +259,10 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
     }
 
     private void checkLatestUpstreamVersion(final Callback<VersionNumber> callback) {
@@ -9177,7 +9210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -380,7 +380,7 @@
+@@ -404,7 +404,7 @@
     No recent activities
   </message>
   <message name="IDS_EXTENSIONS_NO_INSTALLED_ITEMS" desc="The message shown to the user on the Extensions settings page when there are no extensions or apps installed.">
@@ -9186,27 +9219,27 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
   </message>
   <message name="IDS_EXTENSIONS_NO_DESCRIPTION" desc="The message shown to the user when an extension does not have any description.">
     No description provided
-@@ -515,7 +515,7 @@
+@@ -542,7 +542,7 @@
     My extensions
   </message>
-   <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar to open the Chrome Web Store to get more extensions.">
+   <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar of the chrome://extensions page to open the Chrome Web Store to get more extensions.">
 -    Discover more extensions and themes on the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Chrome Web Store<ph name="END_LINK">&lt;/a&gt; <ex>&lt;/a&gt;</ex> </ph>
 +    Discover more extensions and themes on the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Chromedontreplace Web Store<ph name="END_LINK">&lt;/a&gt; <ex>&lt;/a&gt;</ex> </ph>
   </message>
-   <message name="IDS_EXTENSIONS_SIDEBAR_KEYBOARD_SHORTCUTS" desc="The text for the link to manage keyboard shortcuts for extensions.">
-     Keyboard shortcuts
+   <message name="IDS_EXTENSIONS_WHATS_NEW_SIDEBAR_PROMO" desc="The text displayed in the sidebar of the chrome://extensions page to promote the extension documenation, for when the user is in developer mode.">
+     Developing extensions? Stay up to date on <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>What's New<ph name="END_LINK">&lt;/a&gt;</ph> with Chrome Extension developer documentation.
 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
-@@ -323,7 +323,7 @@
-     Change
+@@ -84,7 +84,7 @@
+     Accessibility
   </message>
-   <message name="IDS_SETTINGS_WEB_STORE" desc="Sub-label about choosing something from the Chrome Web Store.">
+   <message name="IDS_SETTINGS_ACCESSIBILITY_WEB_STORE" desc="Text for an external link explaining that additional accessibility features are found on the Chrome Web Store.">
 -    Open Chrome Web Store
 +    Open Chromedontreplace Web Store
   </message>
-   <if expr="is_macosx">
-     <message name="IDS_SETTINGS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
+   <message name="IDS_SETTINGS_MORE_FEATURES_LINK" desc="Link which opens page where users can install extensions which provide additional accessibility features.">
+     Add accessibility features
 diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
 --- a/chrome/app/theme/chromium/BRANDING
 +++ b/chrome/app/theme/chromium/BRANDING
@@ -13152,27 +13185,50 @@ e)fqMZZ`3a)Ds&5H<cfp<0000<MNUMnLSTYHt&Yn8
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2095,6 +2095,7 @@ static_library("browser") {
-     "//build:chromeos_buildflags",
+@@ -1886,6 +1886,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
+     "//build/config/linux/dbus:buildflags",
 +    "//build:cromite_buildflags",
     "//cc",
     "//chrome:extra_resources",
     "//chrome:resources",
+diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+--- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+@@ -39,7 +39,7 @@ public class UpdateConfigs {
+     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
+     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
+ 
+-    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS;
+    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 1 * DateUtils.DAY_IN_MILLIS;
+     private static final long DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS = 2 * DateUtils.DAY_IN_MILLIS;
+ 
+     /** Possible update flow configurations. */
+diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
+--- a/chrome/browser/prefs/BUILD.gn
+++ b/chrome/browser/prefs/BUILD.gn
+@@ -59,6 +59,7 @@ source_set("impl") {
+   deps = [
+     ":prefs",
+     ":util",
+    "//build:cromite_buildflags",
+     "//chrome/browser:browser_process",
+     "//chrome/browser:flags",
+     "//chrome/browser/autocomplete:aim_eligibility_service",
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -24,6 +24,7 @@
+@@ -26,6 +26,7 @@
+ #include "base/trace_event/trace_event.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
 +#include "build/cromite_flags.h"
 #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
- #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
-@@ -270,10 +271,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
- #endif
+@@ -286,10 +287,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+     const base::FilePath& profile_path) {
   std::string seed;
   CHECK(ui::ResourceBundle::HasSharedInstance());
 -#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -13180,9 +13236,9 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 -      IDR_PREF_HASH_SEED_BIN));
 -#endif
 +  seed = BUILDFLAG_INTERNAL_CROMITE_PREF_HASH_SEED_BIN();
-   return std::make_unique<ProfilePrefStoreManager>(profile_path, seed,
-                                                    legacy_device_id);
+   return std::make_unique<ProfilePrefStoreManager>(profile_path, seed);
 }
+ 
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -13198,23 +13254,63 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/br
 diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
 --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
 +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
-@@ -31,9 +31,10 @@
+@@ -10,6 +10,18 @@
+         -webkit-tap-highlight-color: transparent;
       }
 
-       #aboutIcon {
-        --cr-icon-image: url(//resources/images/chrome_logo_dark.svg);
+      #aboutIcon {
 +        background: url('chrome://theme/current-channel-logo@1x');
 +        background-size: 20px 20px;
 +        filter: grayscale();
-         -webkit-mask-size: 18px;
-        background-color: var(--iron-icon-fill-color);
-         display: block;
-         height: var(--cr-icon-size);
-         margin-inline-end: 20px;
+        -webkit-mask-size: 18px;
+        display: block;
+        height: var(--cr-icon-size);
+        margin-inline-end: 20px;
+        margin-inline-start: 0;
+        width: var(--cr-icon-size);
+      }
+
+       #menu {
+         color: var(--google-grey-700);
+         display: flex;
+@@ -164,7 +176,7 @@
+         </a>
+         <a role="menuitem" id="about-menu" href="/help"
+             class="cr-nav-menu-item">
+-          <cr-icon icon="cr:chrome-product"></cr-icon>
+          <span id="aboutIcon" class="cr-icon" role="presentation"></span>
+           $i18n{aboutPageTitle}
+           <cr-ripple></cr-ripple>
+         </a>
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
+@@ -34,6 +34,7 @@ import org.chromium.components.omnibox.OmniboxFeatures;
+ import org.chromium.ui.KeyboardVisibilityDelegate;
+ import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.ViewUtils;
+import org.chromium.ui.KeyboardUtils;
+ 
+ import java.util.Optional;
+ 
+@@ -104,8 +105,11 @@ public class OmniboxSuggestionsContainer extends FrameLayout {
+         // Omnibox.
+         // Making the container `clickable=true` achieves similar goal, but this consumes all
+         // activators, including keyboard <Enter> key.
+-        super.onTouchEvent(event);
+-        return true;
+        if (KeyboardUtils.isAndroidSoftKeyboardShowing(this)) {
+            KeyboardUtils.hideAndroidSoftKeyboard(this);
+            return true;
+        }
+        return false;
+     }
+ 
+     private void maybeUpdateLayoutParams(int topMargin) {
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -2169,7 +2169,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2338,7 +2338,7 @@ Your Google account may have other forms of browsing history like searches and a
         About Chrome
       </message>
       <message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
@@ -13223,39 +13319,62 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       </message>
       <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
         Application version
+diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+@@ -140,6 +140,7 @@ bool AreNewChromeLabsExperimentsAvailable(Profile* profile) {
+ }
+ 
+ bool IsChromeLabsEnabled() {
+  if ((true)) return false;
+   // Always early out on the stable channel regardless of other conditions.
+   if (chrome::GetChannel() == version_info::Channel::STABLE) {
+     return false;
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -126,7 +126,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -135,7 +135,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
 inline constexpr char kChromeHelpViaWebUIURL[] =
 -    "https://support.google.com/chrome?p=help&ctx=settings";
 +    "https://github.com/uazo/cromite/issues";
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 inline constexpr char kChromeOsHelpViaWebUIURL[] =
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -189,7 +189,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
     "chrome-untrusted://new-tab-page/";
 
 // The URL for the Chromium project used in the About dialog.
 -inline constexpr char16_t kChromiumProjectURL[] = u"https://www.chromium.org/";
 +inline constexpr char16_t kChromiumProjectURL[] = u"https://www.cromite.org/";
 
- inline constexpr char16_t kContentSettingsExceptionsLearnMoreURL[] =
-     u"https://support.google.com/chrome?p=settings_manage_exceptions";
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ // The URL for the "Clear browsing data in Chrome" help center article.
+diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_static/chromium_install_modes.cc
+--- a/chrome/install_static/chromium_install_modes.cc
+++ b/chrome/install_static/chromium_install_modes.cc
+@@ -14,7 +14,7 @@ namespace install_static {
+ 
+ const wchar_t kCompanyPathName[] = L"";
+ 
+-const wchar_t kProductPathName[] = L"Chromium";
+const wchar_t kProductPathName[] = L"Cromite";
+ 
+ const size_t kProductPathNameLength = _countof(kProductPathName) - 1;
+ 
 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
-@@ -987,7 +987,7 @@
+@@ -1008,7 +1008,7 @@
 
       <!-- Accessibility preferences -->
       <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR_LIMIT=32]">
 -        Accessibility
 +        Accessibility and UI
       </message>
-       <message name="IDS_FONT_SIZE" desc="Title for font size preference.">
-         Text scaling
+       <message name="IDS_FONT_SIZE_ACCESSIBILITY_LABEL" desc="Accessibility label for control to allow user to change font size.">
+         Text scaling set to <ph name="TEXT_SCALING">%1$s<ex>100%</ex></ph>
 diff --git a/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png b/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png
 index 2353496bafc8f8559a8fcbf6d609302327dc820c..9d123a8918eea5e93f6139534d7dc01a88c4278f 100644
 GIT binary patch
@@ -18161,15 +18280,15 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 -// found in the LICENSE file.
 -
 -CANVAS_DIMENSIONS, 15,
-MOVE_TO, 4.92f, 7.5f,
-R_CUBIC_TO, 0, 0.71f, 0.25f, 1.31f, 0.76f, 1.82f,
-R_CUBIC_TO, 0.51f, 0.51f, 1.12f, 0.76f, 1.82f, 0.76f,
-R_CUBIC_TO, 0.7f, 0, 1.31f, -0.25f, 1.82f, -0.76f,
-R_CUBIC_TO, 0.51f, -0.51f, 0.76f, -1.12f, 0.76f, -1.82f,
-R_CUBIC_TO, 0, -0.7f, -0.25f, -1.31f, -0.76f, -1.82f,
-R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -1.82f, -0.76f,
-R_CUBIC_TO, -0.7f, 0, -1.31f, 0.25f, -1.82f, 0.76f,
-R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -0.76f, 1.82f,
+-MOVE_TO, 4.92, 7.5,
+-R_CUBIC_TO, 0, 0.71, 0.25, 1.31, 0.76, 1.82,
+-R_CUBIC_TO, 0.51, 0.51, 1.12, 0.76, 1.82, 0.76,
+-R_CUBIC_TO, 0.7, 0, 1.31, -0.25, 1.82, -0.76,
+-R_CUBIC_TO, 0.51, -0.51, 0.76, -1.12, 0.76, -1.82,
+-R_CUBIC_TO, 0, -0.7, -0.25, -1.31, -0.76, -1.82,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -1.82, -0.76,
+-R_CUBIC_TO, -0.7, 0, -1.31, 0.25, -1.82, 0.76,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -0.76, 1.82,
 +CANVAS_DIMENSIONS, 16,
 +MOVE_TO, 15.99f, 8,
 +CUBIC_TO, 15.99f, 9.83f, 15.37f, 11.52f, 14.34f, 12.87f,
@@ -18181,47 +18300,47 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 +CUBIC_TO, 14.47f, 3.29f, 14.38f, 3.18f, 14.29f, 3.07f,
 +CUBIC_TO, 15.36f, 4.43f, 15.99f, 6.14f, 15.99f, 8,
 CLOSE,
-MOVE_TO, 7.5f, 11.48f,
-R_CUBIC_TO, 0.14f, 0, 0.28f, 0, 0.41f, -0.02f,
-R_CUBIC_TO, 0.13f, -0.01f, 0.26f, -0.04f, 0.39f, -0.07f,
-LINE_TO, 6.77f, 14.06f,
-R_CUBIC_TO, -1.65f, -0.19f, -3.04f, -0.89f, -4.15f, -2.12f,
-CUBIC_TO, 1.5f, 10.71f, 0.94f, 9.24f, 0.94f, 7.55f,
-R_CUBIC_TO, 0, -0.46f, 0.05f, -0.9f, 0.13f, -1.33f,
-R_CUBIC_TO, 0.08f, -0.44f, 0.22f, -0.85f, 0.39f, -1.25f,
-R_LINE_TO, 2.63f, 4.55f,
-R_CUBIC_TO, 0.34f, 0.59f, 0.81f, 1.07f, 1.41f, 1.43f,
-R_CUBIC_TO, 0.6f, 0.36f, 1.26f, 0.54f, 2.01f, 0.54f,
+-MOVE_TO, 7.5, 11.48,
+-R_CUBIC_TO, 0.14, 0, 0.28, 0, 0.41, -0.02,
+-R_CUBIC_TO, 0.13, -0.01, 0.26, -0.04, 0.39, -0.07,
+-LINE_TO, 6.77, 14.06,
+-R_CUBIC_TO, -1.65, -0.19, -3.04, -0.89, -4.15, -2.12,
+-CUBIC_TO, 1.5, 10.71, 0.94, 9.24, 0.94, 7.55,
+-R_CUBIC_TO, 0, -0.46, 0.05, -0.9, 0.13, -1.33,
+-R_CUBIC_TO, 0.08, -0.44, 0.22, -0.85, 0.39, -1.25,
+-R_LINE_TO, 2.63, 4.55,
+-R_CUBIC_TO, 0.34, 0.59, 0.81, 1.07, 1.41, 1.43,
+-R_CUBIC_TO, 0.6, 0.36, 1.26, 0.54, 2.01, 0.54,
 +MOVE_TO, 14.29f, 3.07f,
 +CUBIC_TO, 14.29f, 3.06f, 14.28f, 3.05f, 14.27f, 3.04f,
 +CUBIC_TO, 14.28f, 3.05f, 14.29f, 3.06f, 14.29f, 3.07f,
 CLOSE,
-R_MOVE_TO, 0, -7.87f,
-R_CUBIC_TO, -0.87f, 0, -1.65f, 0.25f, -2.33f, 0.77f,
-R_ARC_TO, 3.95f, 3.95f, 0, 0, 0, -1.42f, 1.94f,
-LINE_TO, 2.21f, 3.66f,
-R_ARC_TO, 6.79f, 6.79f, 0, 0, 1, 2.27f, -1.94f,
-CUBIC_TO, 5.4f, 1.22f, 6.4f, 0.98f, 7.5f, 0.98f,
-R_CUBIC_TO, 1.1f, 0, 2.08f, 0.24f, 2.99f, 0.72f,
-ARC_TO, 6.66f, 6.66f, 0, 0, 1, 12.76f, 3.6f,
-H_LINE_TO, 7.51f,
-R_LINE_TO, -0.01f, 0.01f,
+-R_MOVE_TO, 0, -7.87,
+-R_CUBIC_TO, -0.87, 0, -1.65, 0.25, -2.33, 0.77,
+-R_ARC_TO, 3.95, 3.95, 0, 0, 0, -1.42, 1.94,
+-LINE_TO, 2.21, 3.66,
+-R_ARC_TO, 6.79, 6.79, 0, 0, 1, 2.27, -1.94,
+-CUBIC_TO, 5.4, 1.22, 6.4, 0.98, 7.5, 0.98,
+-R_CUBIC_TO, 1.1, 0, 2.08, 0.24, 2.99, 0.72,
+-ARC_TO, 6.66, 6.66, 0, 0, 1, 12.76, 3.6,
+-H_LINE_TO, 7.51,
+-R_LINE_TO, -0.01, 0.01,
 +MOVE_TO, 14.34f, 12.87f,
 +CUBIC_TO, 14.29f, 12.93f, 14.24f, 12.99f, 14.2f, 13.05f,
 +CUBIC_TO, 14.24f, 12.99f, 14.29f, 12.93f, 14.34f, 12.87f,
 CLOSE,
-R_MOVE_TO, 6.01f, 1.31f,
-R_CUBIC_TO, 0.19f, 0.4f, 0.32f, 0.83f, 0.41f, 1.27f,
-R_CUBIC_TO, 0.09f, 0.44f, 0.15f, 0.89f, 0.15f, 1.36f,
-R_CUBIC_TO, 0, 1.7f, -0.55f, 3.16f, -1.68f, 4.38f,
-R_CUBIC_TO, -1.11f, 1.23f, -2.47f, 1.93f, -4.1f, 2.13f,
-R_LINE_TO, 2.63f, -4.55f,
-R_CUBIC_TO, 0.17f, -0.28f, 0.29f, -0.59f, 0.38f, -0.92f,
-R_CUBIC_TO, 0.09f, -0.34f, 0.15f, -0.69f, 0.15f, -1.05f,
-R_CUBIC_TO, 0, -0.52f, -0.09f, -0.99f, -0.28f, -1.42f,
-R_ARC_TO, 3.96f, 3.96f, 0, 0, 0, -0.74f, -1.2f,
-R_H_LINE_TO, 3.08f,
-R_V_LINE_TO, 0.01f,
+-R_MOVE_TO, 6.01, 1.31,
+-R_CUBIC_TO, 0.19, 0.4, 0.32, 0.83, 0.41, 1.27,
+-R_CUBIC_TO, 0.09, 0.44, 0.15, 0.89, 0.15, 1.36,
+-R_CUBIC_TO, 0, 1.7, -0.55, 3.16, -1.68, 4.38,
+-R_CUBIC_TO, -1.11, 1.23, -2.47, 1.93, -4.1, 2.13,
+-R_LINE_TO, 2.63, -4.55,
+-R_CUBIC_TO, 0.17, -0.28, 0.29, -0.59, 0.38, -0.92,
+-R_CUBIC_TO, 0.09, -0.34, 0.15, -0.69, 0.15, -1.05,
+-R_CUBIC_TO, 0, -0.52, -0.09, -0.99, -0.28, -1.42,
+-R_ARC_TO, 3.96, 3.96, 0, 0, 0, -0.74, -1.2,
+-R_H_LINE_TO, 3.08,
+-R_V_LINE_TO, 0.01,
 +MOVE_TO, 14.27f, 3.04f,
 +CUBIC_TO, 14.19f, 2.94f, 14.11f, 2.84f, 14.02f, 2.74f,
 +CUBIC_TO, 14.11f, 2.84f, 14.19f, 2.94f, 14.27f, 3.04f,
@@ -18853,10 +18972,166 @@ z%lwlC#@8v20MrdyXS4Cd9v0(a*!707Mi)DWKCPo$-?g#BRX!@}3RwzBwgOM1&^{Rc
 z3=3bI32q;3&^A^#@RQ;k{^t41Rq+f34W3u|*@1288y{>q;|6&;qJI})ZE0^oH1|#U
 EKU(of)Bpeg

+diff --git a/components/webui/version/resources/about_version.ts b/components/webui/version/resources/about_version.ts
+--- a/components/webui/version/resources/about_version.ts
+++ b/components/webui/version/resources/about_version.ts
+@@ -51,7 +51,7 @@ function handleVariationInfo(
+         .appendChild(document.createElement('br'));
+   }
+ 
+-  const includeVariationsCmd = location.search.includes('show-variations-cmd');
+  const includeVariationsCmd = true;
+   if (variationsCmd !== '') {
+     getRequiredElement('variations-cmd-section').hidden = false;
+     getRequiredElement('copy-variations-to-clipboard').hidden =
+@@ -180,7 +180,7 @@ function initialize() {
+   // </if>
+ 
+   chrome.send('requestVersionInfo');
+-  const includeVariationsCmd = location.search.includes('show-variations-cmd');
+  const includeVariationsCmd = true;
+   sendWithPromise('requestVariationInfo', includeVariationsCmd)
+       .then(handleVariationInfo);
+   sendWithPromise('requestPathInfo').then(handlePathInfo);
+diff --git a/components/webui/version/resources/about_version_mobile.css b/components/webui/version/resources/about_version_mobile.css
+--- a/components/webui/version/resources/about_version_mobile.css
+++ b/components/webui/version/resources/about_version_mobile.css
+@@ -17,3 +17,12 @@
+   margin-left: auto;
+   margin-right: auto;
+ }
+
+tr, td {
+  display: block;
+  text-align: left !important;
+}
+
+td:last-child {
+  margin-bottom: 8px;
+}
+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
+@@ -571,19 +571,22 @@ void ResolveInvalidConfigurations() {
+        base::FeatureList::IsEnabled(
+            features::kPrivacySandboxAdsAPIsM1Override)) &&
+       !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsFencedFramesEnabled())
+    CHECK(!WebRuntimeFeatures::IsFencedFramesEnabled())
+         << "Fenced frames cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kFencedFrames.name << " instead.";
+     WebRuntimeFeatures::EnableFencedFrames(false);
+   }
+  CHECK(!base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIsOverride))
+    << "kPrivacySandboxAdsAPIsOverride is enabled!";
+  CHECK(!base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIsM1Override))
+    << "kPrivacySandboxAdsAPIsM1Override is enabled!";
+ 
+   if (!base::FeatureList::IsEnabled(blink::features::kFencedFrames) &&
+       base::FeatureList::IsEnabled(
+           blink::features::kFencedFramesLocalUnpartitionedDataAccess)) {
+-    LOG_IF(
+-        WARNING,
+-        WebRuntimeFeatures::IsFencedFramesLocalUnpartitionedDataAccessEnabled())
+    CHECK(
+        !WebRuntimeFeatures::IsFencedFramesLocalUnpartitionedDataAccessEnabled())
+         << "Fenced frames must be enabled in order to enable local "
+            "unpartitioned "
+         << "data access. Use --" << switches::kEnableFeatures << "="
+@@ -591,12 +594,14 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableFeatureFromString(
+         "FencedFramesLocalUnpartitionedDataAccess", false);
+   }
+  CHECK(!base::FeatureList::IsEnabled(blink::features::kFencedFrames))
+    << "kFencedFrames is enabled!";
+ 
+   // Topics API cannot be enabled without the support of the browser process.
+   // The Document API should be additionally gated by the
+   // `kBrowsingTopicsDocumentAPI` feature.
+   if (!base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsAPIEnabled())
+    CHECK(!WebRuntimeFeatures::IsTopicsAPIEnabled())
+         << "Topics cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << network::features::kBrowsingTopics.name << " in addition.";
+@@ -604,30 +609,23 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+     WebRuntimeFeatures::EnableTopicsImgAPI(false);
+   } else {
+-    if (!base::FeatureList::IsEnabled(
+-            blink::features::kBrowsingTopicsDocumentAPI)) {
+-      LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
+-          << "Topics Document API cannot be enabled in this configuration. Use "
+-             "--"
+-          << switches::kEnableFeatures << "="
+-          << blink::features::kBrowsingTopicsDocumentAPI.name
+-          << " in addition.";
+-      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+-    }
+    CHECK(false) << "kBrowsingTopics is enabled!";
+   }
+ 
+   if (!base::FeatureList::IsEnabled(network::features::kSharedStorageAPI)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsSharedStorageAPIEnabled())
+-        << "SharedStorage cannot be enabled in this "
+    CHECK(!WebRuntimeFeatures::IsSharedStorageAPIEnabled())
+        << "SharedStorage for M118+ cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << network::features::kSharedStorageAPI.name << " in addition.";
+     WebRuntimeFeatures::EnableSharedStorageAPI(false);
+  } else {
+    CHECK(false) << "kSharedStorageAPI is enabled!";
+   }
+ 
+   if (!base::FeatureList::IsEnabled(
+           attribution_reporting::features::kConversionMeasurement)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsAttributionReportingEnabled())
+    CHECK(!WebRuntimeFeatures::IsAttributionReportingEnabled())
+         << "AttributionReporting cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+@@ -635,23 +633,25 @@ void ResolveInvalidConfigurations() {
+         << " in addition.";
+     WebRuntimeFeatures::EnableAttributionReporting(false);
+   }
+  CHECK(!base::FeatureList::IsEnabled(attribution_reporting::features::kConversionMeasurement))
+    << "kConversionMeasurement is enabled!";
+ 
+   if (!base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
+    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
+         << "AdInterestGroupAPI cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << network::features::kInterestGroupStorage.name << " in addition.";
+     WebRuntimeFeatures::EnableAdInterestGroupAPI(false);
+     WebRuntimeFeatures::EnableFledge(false);
+  } else {
+    CHECK(false) << "kInterestGroupStorage is enabled!";
+   }
+ 
+   // PermissionElement cannot be enabled without the support of the
+   // browser process.
+   if (!base::FeatureList::IsEnabled(blink::features::kPermissionElement)) {
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
+    CHECK(!WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
+         << "PermissionElement cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kPermissionElement.name << " instead.";
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
+@@ -0,0 +1 @@
+// Empty file
 diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
 --- a/tools/grit/grit/grd_reader.py
 +++ b/tools/grit/grit/grd_reader.py
-@@ -126,6 +126,7 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
+@@ -129,6 +129,7 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
   def characters(self, content):
     if self.ignore_depth == 0:
       if self.stack[-1]:
@@ -18864,7 +19139,7 @@ diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
         self.stack[-1].AppendContent(content)
 
   def ignorableWhitespace(self, whitespace):
-@@ -133,6 +134,40 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
+@@ -136,6 +137,40 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
     # parser?
     pass
 
@@ -18905,14 +19180,4 @@ diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
 
 class GrdPartContentHandler(xml.sax.handler.ContentHandler):
   def __init__(self, parent):
-diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
--- a/ui/base/ui_base_features.cc
-+++ b/ui/base/ui_base_features.cc
-@@ -659,4 +659,6 @@ BASE_FEATURE(kUseGammaContrastRegistrySettings,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_WIN)
- 
-+SET_CROMITE_FEATURE_ENABLED(kChromeRefresh2023);
-+SET_CROMITE_FEATURE_ENABLED(kChromeWebuiRefresh2023);
- }  // namespace features
 --
@@ -15,19 +15,19 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../chrome/browser/ui/RootUiCoordinator.java  |   8 +-
 .../Customize-selection-popup.grdp            |  34 +++++
 .../res/xml/accessibility_preferences.xml     |  24 ++++
- .../selection/SelectActionMenuHelper.java     | 131 ++++++++++++------
+ .../selection/SelectActionMenuHelper.java     | 129 ++++++++++++------
 .../selection/SmartSelectionClient.java       |   4 +
- 10 files changed, 193 insertions(+), 52 deletions(-)
+ 10 files changed, 192 insertions(+), 51 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
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
-@@ -148,9 +148,7 @@ public class ChromeActionModeHandler {
+@@ -173,9 +173,7 @@ public class ChromeActionModeHandler {
                             | ActionModeCallbackHelper.MENU_ITEM_SHARE;
             // Disable options that expose additional Chrome functionality prior to the FRE being
             // completed (i.e. creation of a new tab).
-            if (FirstRunStatus.getFirstRunFlowComplete()) {
+-            if (FirstRunStatus.getFirstRunFlowComplete() && mShowWebSearch) {
 -                allowedActionModes |= ActionModeCallbackHelper.MENU_ITEM_WEB_SEARCH;
 -            }
 +            allowedActionModes |= ActionModeCallbackHelper.MENU_ITEM_WEB_SEARCH;
@@ -37,14 +37,14 @@ 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
-@@ -754,10 +754,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -884,10 +884,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
                                 @TabLaunchType int type,
                                 @TabCreationState int creationState,
                                 boolean markedForSelection) {
 -                            if (type == TabLaunchType.FROM_LONGPRESS_BACKGROUND
 -                                    || type == TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
-                                    || type == TabLaunchType.FROM_RECENT_TABS
-                                            && !DeviceClassManager.enableAnimations()) {
+-                                    || (type == TabLaunchType.FROM_RECENT_TABS
+-                                            && !DeviceClassManager.enableAnimations())) {
 +                            boolean selectionPopupTabsForeground =
 +                                ContextUtils.getAppSharedPreferences().getBoolean(
 +                                    "selection_popup_tabs_foreground", false);
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-@@ -191,12 +191,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -271,6 +271,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
         // Skip opening a new Tab if it doesn't make sense.
         if (mTab.isClosing()) return false;
 
@@ -74,30 +74,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 +            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) {
+         WindowAndroid window = mTab.getWindowAndroid();
+         boolean openingPopup =
+                 window != null
+@@ -301,7 +309,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+                         mTab,
+                         /* shouldPin= */ false,
+                         webContents,
+-                        TabLaunchType.FROM_LONGPRESS_FOREGROUND,
+                        tabLaunchType,
+                         url,
+                         !openingPopup && !willReparentTab);
+         if (tab == null) return false;
 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
-@@ -16,6 +16,7 @@ import android.view.ViewGroup;
- import androidx.annotation.Nullable;
+@@ -18,6 +18,7 @@ import android.view.ViewGroup;
 import androidx.annotation.VisibleForTesting;
 
+ import org.chromium.base.Callback;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.supplier.ObservableSupplier;
-@@ -227,6 +228,13 @@ public class LayoutManagerImpl
-                                         && launchType != TabLaunchType.FROM_RECENT_TABS
-                                         && launchType != TabLaunchType.FROM_RESTORE_TABS_UI
+@@ -247,6 +248,13 @@ public class LayoutManagerImpl
+                                                 != TabLaunchType
+                                                         .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                 || (!getTabModelSelector().isIncognitoSelected() && incognito);
 +                boolean selectionPopupTabsForeground =
 +                            ContextUtils.getAppSharedPreferences().getBoolean(
@@ -112,8 +114,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -285,8 +285,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
-     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
+@@ -386,8 +386,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+     public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
         loadUrlParams.setReferrer(referrer);
 +        @TabLaunchType int type = TabLaunchType.FROM_LONGPRESS_BACKGROUND;
@@ -126,36 +128,36 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 +                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
-@@ -27,6 +27,7 @@ import androidx.appcompat.content.res.AppCompatResources;
- 
+@@ -30,6 +30,7 @@ import androidx.core.view.WindowInsetsCompat;
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
+ import org.chromium.base.DeviceInfo;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.TraceEvent;
+ import org.chromium.base.lifetime.Destroyable;
 import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.ObservableSupplier;
-@@ -841,11 +842,16 @@ public class RootUiCoordinator
-                             TrackerFactory.getTrackerForProfile(tab.getProfile())
-                                     .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
+@@ -842,11 +843,16 @@ public class RootUiCoordinator
+                     TrackerFactory.getTrackerForProfile(tab.getProfile())
+                             .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
 
-+                            boolean selection_popup_web_search_to_group =
-+                                ContextUtils.getAppSharedPreferences().getBoolean(
-+                                    "selection_popup_web_search_to_group", false);
+                    boolean selection_popup_web_search_to_group =
+                        ContextUtils.getAppSharedPreferences().getBoolean(
+                            "selection_popup_web_search_to_group", false);
 +
-                             mTabModelSelectorSupplier
-                                     .get()
-                                     .openNewTab(
-                                             generateUrlParamsForSearch(tab, query),
-                                            TabLaunchType.FROM_LONGPRESS_FOREGROUND,
-+                                            selection_popup_web_search_to_group ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
-+                                                                                : TabLaunchType.FROM_LONGPRESS_FOREGROUND,
-                                             tab,
-                                             tab.isIncognito());
-                         },
+                     mTabModelSelectorSupplier
+                             .get()
+                             .openNewTab(
+                                     generateUrlParamsForSearch(tab, query),
+-                                    TabLaunchType.FROM_LONGPRESS_FOREGROUND,
+                                    selection_popup_web_search_to_group ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
+                                                                        : TabLaunchType.FROM_LONGPRESS_FOREGROUND,
+                                     tab,
+                                     tab.isIncognito());
+                 },
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp
 new file mode 100644
 --- /dev/null
@@ -198,7 +200,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -73,4 +73,28 @@ found in the LICENSE file.
+@@ -79,4 +79,28 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -230,15 +232,15 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
- 
+@@ -27,6 +27,7 @@ import androidx.core.content.ContextCompat;
+ import org.chromium.base.ApiCompatibilityUtils;
 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;
-@@ -51,38 +52,84 @@ import java.util.TreeSet;
+ import org.chromium.build.annotations.NullMarked;
+@@ -54,38 +55,84 @@ import java.util.TreeSet;
 public class SelectActionMenuHelper {
     private static final String TAG = "SelectActionMenu"; // 20 char limit.
 
@@ -353,16 +355,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
     }
 
     @Retention(RetentionPolicy.SOURCE)
-@@ -159,7 +206,7 @@ public class SelectActionMenuHelper {
-             if (!additionalMenuItems.isEmpty()) {
-                 // Additional menu item group which comes after default menu items.
-                 SelectionMenuGroup additionalItemGroup =
-                        new SelectionMenuGroup(Menu.NONE, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
-+                        new SelectionMenuGroup(Menu.NONE, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
-                 additionalItemGroup.addItems(additionalMenuItems);
-                 pasteMenuItems.add(additionalItemGroup);
-             }
-@@ -225,7 +272,7 @@ public class SelectActionMenuHelper {
+@@ -200,7 +247,7 @@ public class SelectActionMenuHelper {
         }
         SelectionMenuGroup primaryAssistGroup =
                 new SelectionMenuGroup(
@@ -371,7 +364,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;
-@@ -251,7 +298,7 @@ public class SelectActionMenuHelper {
+@@ -227,7 +274,7 @@ public class SelectActionMenuHelper {
             String selectedText) {
         SelectionMenuGroup defaultGroup =
                 new SelectionMenuGroup(
@@ -380,16 +373,16 @@ 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()));
-@@ -302,7 +349,7 @@ public class SelectActionMenuHelper {
-         // these menu items.
+@@ -255,7 +302,7 @@ public class SelectActionMenuHelper {
+         // menu items if there is selected text.
+         @IdRes int groupId = selectedText.isEmpty() ? Menu.NONE : android.R.id.textAssist;
         SelectionMenuGroup secondaryAssistItems =
-                 new SelectionMenuGroup(
-                        android.R.id.textAssist, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
-+                        android.R.id.textAssist, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
+-                new SelectionMenuGroup(groupId, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
+                new SelectionMenuGroup(groupId, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
 
-         // First action is reserved for primary action so start at index 1.
-         final int startIndex = 1;
-@@ -335,7 +382,7 @@ public class SelectActionMenuHelper {
+         if (selectedText.isEmpty() && selectionActionMenuDelegate != null) {
+             List<SelectionMenuItem> additionalMenuItems =
+@@ -317,7 +364,7 @@ public class SelectActionMenuHelper {
         SelectionMenuGroup textProcessingItems =
                 new SelectionMenuGroup(
                         R.id.select_action_menu_text_processing_items,
@@ -398,7 +391,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
         if (isSelectionPassword || intentHandler == null) {
             addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
             return textProcessingItems;
-@@ -432,7 +479,7 @@ public class SelectActionMenuHelper {
+@@ -419,7 +466,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_cut)
                 .setIconAttr(android.R.attr.actionModeCutDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
@@ -407,7 +400,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)
-@@ -444,7 +491,7 @@ public class SelectActionMenuHelper {
+@@ -431,7 +478,7 @@ public class SelectActionMenuHelper {
                 .setId(R.id.select_action_menu_copy)
                 .setIconAttr(android.R.attr.actionModeCopyDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
@@ -416,7 +409,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_paste)
                 .setIconAttr(android.R.attr.actionModePasteDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
@@ -425,7 +418,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)
-@@ -470,7 +517,7 @@ public class SelectActionMenuHelper {
+@@ -457,7 +504,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 +427,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 {
                 .setId(R.id.select_action_menu_select_all)
                 .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
                 .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
@@ -443,7 +436,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)
-@@ -495,7 +542,7 @@ public class SelectActionMenuHelper {
+@@ -481,7 +528,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 +445,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);
-@@ -515,7 +562,7 @@ public class SelectActionMenuHelper {
+@@ -501,7 +548,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)
@@ -464,22 +457,22 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
-@@ -17,6 +17,7 @@ import org.jni_zero.CalledByNative;
+@@ -18,6 +18,7 @@ import org.jni_zero.CalledByNative;
 import org.jni_zero.JNINamespace;
 import org.jni_zero.NativeMethods;
 
 +import org.chromium.base.ContextUtils;
- import org.chromium.content_public.browser.SelectAroundCaretResult;
- import org.chromium.content_public.browser.SelectionClient;
- import org.chromium.content_public.browser.SelectionEventProcessor;
-@@ -69,6 +70,9 @@ public class SmartSelectionClient implements SelectionClient {
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.UserData;
+ import org.chromium.build.annotations.Initializer;
+@@ -84,6 +85,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
             return null;
         }
 
 +        if (!ContextUtils.getAppSharedPreferences().getBoolean(
 +                "selection_popup_smart_text", false)) return null;
 +
-         return new SmartSelectionClient(callback, webContents);
-     }
- 
+         SmartSelectionClient client =
+                 assumeNonNull(
+                         webContents.getOrSetUserData(
 --
@@ -1,24 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 5 Jun 2023 17:02:33 +0000
-Subject: Deprecate Data URL in SVGUseElement
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-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
-@@ -3205,8 +3205,8 @@
-       status: "stable",
-     },
-     {
-      name: "RemoveDataUrlInSvgUse",
-      status: "stable",
-+      name: "RemoveDataUrlInSvgUse",  // enabled
-+      status: "stable",               // by default
-     },
-     {
-       name: "RemoveMobileViewportDoubleTap",
--
@@ -10,33 +10,34 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/android/java/res/layout/url_bar.xml    |  1 +
- .../browser/omnibox/LocationBarMediator.java  | 13 +++++++++--
- .../chrome/browser/omnibox/UrlBar.java        | 23 +++++++++++++++++++
- 3 files changed, 35 insertions(+), 2 deletions(-)
+ .../browser/omnibox/LocationBarMediator.java  | 14 ++++++++---
+ .../chrome/browser/omnibox/UrlBar.java        | 24 +++++++++++++++++++
+ 3 files changed, 36 insertions(+), 3 deletions(-)

 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
 --- a/chrome/android/java/res/layout/url_bar.xml
 +++ b/chrome/android/java/res/layout/url_bar.xml
-@@ -15,5 +15,6 @@ found in the LICENSE file.
+@@ -16,6 +16,7 @@ found in the LICENSE file.
     android:singleLine="true"
     android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
     android:textAppearance="@style/TextAppearance.SearchBoxText"
 +    android:inputType="textUri"
     android:hint="@string/omnibox_empty_hint"
-     android:importantForAutofill="no" />
+     app:layout_constraintStart_toEndOf="@id/location_bar_status"
+     app:layout_constraintEnd_toStartOf="@id/url_action_container"
 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
-@@ -291,8 +291,17 @@ class LocationBarMediator
-             if (mNativeInitialized) RecordUserAction.record("FocusLocation");
-             // Don't clear Omnibox if the user just pasted text to NTP Omnibox.
-             if (mShouldClearOmniboxOnFocus) {
+@@ -322,8 +322,17 @@ class LocationBarMediator
+             if (!mUrlFocusedWithPastedText
+                     && !shouldRetainOmniboxOnFocus
+                     && mLocationBarLayout.shouldClearTextOnFocus()) {
 -                setUrlBarText(
 -                        UrlBarData.EMPTY, UrlBar.ScrollType.NO_SCROLL, SelectionState.SELECT_END);
 +                UrlBarData data = mLocationBarDataProvider.getUrlBarData();
 +                @SelectionState int selectionState = SelectionState.SELECT_ALL;
 +                GURL url = mLocationBarDataProvider.getUrlBarData().url;
-+                if (url != null && mTemplateUrlServiceSupplier.hasValue()) {
+                if (url != null && mTemplateUrlServiceSupplier.get() != null) {
 +                    String searchParams =
 +                        mTemplateUrlServiceSupplier.get().getSearchQueryForUrl(url);
 +                    if (searchParams != null && !searchParams.isEmpty()) {
@@ -44,13 +45,21 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +                    }
 +                }
 +                setUrlBarText(data, UrlBar.ScrollType.NO_SCROLL, selectionState);
+             } else if (shouldRetainOmniboxOnFocus) {
+                 mUrlCoordinator.setSelectAllOnFocus(true);
             }
-         } else {
-             mUrlFocusedFromFakebox = false;
+@@ -1642,7 +1651,6 @@ class LocationBarMediator
+         mUrlCoordinator.setKeyboardVisibility(true, false);
+     }
+ 
+-
+     // UrlBarDelegate implementation.
+ 
+     @Override
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
-@@ -9,6 +9,7 @@ import android.graphics.Canvas;
+@@ -11,6 +11,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
@@ -58,18 +67,19 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 import android.os.SystemClock;
 import android.text.Editable;
 import android.text.InputType;
-@@ -99,6 +100,7 @@ public abstract class UrlBar extends AutocompleteEditText {
-     private boolean mFocused;
+@@ -115,6 +116,7 @@ public class UrlBar extends AutocompleteEditText {
     private boolean mAllowFocus = true;
+     private boolean mShouldSendTypingStartedEvent;
 
 +    private boolean mPendingSelectAll;
     private boolean mPendingScroll;
+     private boolean mIsInCct;
 
-     // Captures the current intended text scroll type.
-@@ -294,6 +296,27 @@ public abstract class UrlBar extends AutocompleteEditText {
-             mPendingScroll = false;
-         }
+@@ -339,6 +341,28 @@ public class UrlBar extends AutocompleteEditText {
         fixupTextDirection();
+ 
+         mShouldSendTypingStartedEvent = focused;
+
 +        if (mPendingSelectAll) {
 +            UrlBar sender = this;
 +            new Handler().post(new Runnable() {
@@ -27,22 +27,22 @@ 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
-@@ -7,6 +7,11 @@ found in the LICENSE file.
- 
- <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+@@ -8,6 +8,11 @@ found in the LICENSE file.
+ <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"
 +        android:summary="@string/enable_accessibility_summary"
 +        android:title="@string/enable_accessibility_title" />
 +
-     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
-         android:key="text_scale"
-         android:title="@string/font_size"
+     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
+         android:key="page_zoom_default_zoom"
+         android:selectable="false" />
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1039,6 +1039,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1125,6 +1125,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
             structure.setChildCount(0);
             return;
         }
@@ -21,26 +21,26 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/enterprise/util/BUILD.gn b/chrome/browser/enterprise/util/BUILD.gn
 --- a/chrome/browser/enterprise/util/BUILD.gn
 +++ b/chrome/browser/enterprise/util/BUILD.gn
-@@ -20,6 +20,7 @@ android_library("java") {
+@@ -21,6 +21,7 @@ android_library("java") {
     "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
 +    "//components/policy/android:policy_java",
+     "//content/public/android:content_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/jni_zero:jni_zero_java",
-   ]
 diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 --- a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 +++ b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
-@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.TaskTraits;
+@@ -31,6 +31,7 @@ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 +import org.chromium.components.policy.AppRestrictionsProvider;
 
 import java.util.LinkedList;
- import java.util.Queue;
-@@ -76,6 +77,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
+ import java.util.List;
+@@ -113,6 +114,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
             new AsyncTask<OwnedState>() {
                 // TODO: Unit test this function. https://crbug.com/1099262
                 private OwnedState calculateIsRunningOnManagedProfile(Context context) {
@@ -48,13 +48,13 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
 +                        return new OwnedState(/*hasDeviceOwnerApp*/false,
 +                            /*hasProfileOwnerApp*/false);
 +                    }
+                     long startTime = SystemClock.elapsedRealtime();
                     boolean hasProfileOwnerApp = false;
                     boolean hasDeviceOwnerApp = false;
-                     PackageManager packageManager = context.getPackageManager();
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -25,6 +25,7 @@ android_library("java") {
+@@ -26,6 +26,7 @@ android_library("java") {
     "//build:chromeos_buildflags",
     "//build/android:build_java",
     "//chrome/browser/preferences:java",
@@ -86,7 +86,7 @@ new file mode 100644
 +
 +package org.chromium.chrome.browser.flags.cromite;
 +
-+import org.chromium.base.cached_flags.CachedFlag;
+import org.chromium.components.cached_flags.CachedFlag;
 +import org.chromium.chrome.browser.flags.ChromeFeatureMap;
 +import org.chromium.components.policy.AppRestrictionsProvider;
 +
@@ -109,8 +109,8 @@ new file mode 100644
 diff --git a/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java b/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
 --- a/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
 +++ b/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
-@@ -17,6 +17,15 @@ import org.chromium.base.Log;
-  */
+@@ -19,6 +19,15 @@ import org.chromium.build.annotations.NullMarked;
+ @NullMarked
 public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
     private static final String TAG = "AppResProvider";
 +    private static boolean mEnabled = false;
@@ -125,7 +125,7 @@ diff --git a/components/policy/android/java/src/org/chromium/components/policy/A
 
     /**
      * Get the app restriction information from provided user manager, and record some timing
-@@ -28,6 +37,9 @@ public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
+@@ -30,6 +39,9 @@ public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
      */
     public static Bundle getApplicationRestrictionsFromUserManager(
             UserManager userManager, String packageName) {
@@ -0,0 +1,50 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 1 Apr 2025 11:37:52 +0000
+Subject: Disable Android Tab Declutter
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/java/res/xml/main_preferences.xml               | 3 ++-
+ .../org/chromium/chrome/browser/tab/TabArchiveSettings.java    | 3 ++-
+ .../chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc   | 1 +
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+
+diff --git a/chrome/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
+@@ -96,7 +96,8 @@ found in the LICENSE file.
+         android:fragment="org.chromium.chrome.browser.tasks.tab_management.TabsSettings"
+         android:key="tabs"
+         android:order="18"
+-        android:title="@string/tabs_settings_title"/>
+        android:title="@string/tabs_settings_title"
+        app:isPreferenceVisible="false"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
+         android:key="homepage"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+@@ -104,11 +104,12 @@ public class TabArchiveSettings {
+         // are created, and tabs disappearing from tests is very unexpected. For archive tests,
+         // this will need to be turned on manually.
+         return mPrefsManager.readBoolean(
+-                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, !BuildConfig.IS_FOR_TEST);
+                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, false);
+     }
+ 
+     /** Sets whether archive is enabled in settings. */
+     public void setArchiveEnabled(boolean enabled) {
+        enabled = false;
+         mPrefsManager.writeBoolean(ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, enabled);
+     }
+ 
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+@@ -0,0 +1 @@
+// empty
+--
@@ -0,0 +1,40 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 29 Jul 2024 06:48:25 +0000
+Subject: Disable CSS blink-feature support
+
+the function is not currently exposed to websites but is only allowed for testing.
+disabled as it is an potentially advanced fingerprinting mechanism.
+also fixed the possibility of using internal selectors for speculation rules.
+see https://chromium-review.googlesource.com/c/chromium/src/+/5540782
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../blink/renderer/core/css/parser/css_supports_parser.cc       | 2 +-
+ .../renderer/core/speculation_rules/document_rule_predicate.cc  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
+--- a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
+++ b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
+@@ -400,7 +400,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+             feature_name.Value().Utf8()) &&
+         guard.Release()) {
+       stream.ConsumeWhitespace();
+-      return true;
+      return false;
+     }
+   }
+   return false;
+diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
+--- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
+++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
+@@ -578,7 +578,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+     HeapVector<CSSSelector> arena;
+     CSSPropertyValueSet* empty_properties =
+         ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),
+-                                             kUASheetMode);
+                                             kHTMLStandardMode);
+     CSSParserContext* css_parser_context =
+         MakeGarbageCollected<CSSParserContext>(*execution_context);
+     for (auto* raw_selector : raw_selectors) {
+--
@@ -0,0 +1,27 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 2 May 2025 14:20:38 +0000
+Subject: Disable CSSDynamicRangeLimit
+
+Disables the ability for pages to limit the maximum brightness of HDR content
+since use as screen fingerprinting is possible.
+
+see https://www.github.com/w3ctag/design-reviews/issues/1027
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -1316,7 +1316,7 @@
+     },
+     {
+       name: "CSSDynamicRangeLimit",
+-      status: "stable",
+      status: "experimental",
+     },
+     {
+       // Include custom properties in CSSComputedStyleDeclaration::item/length.
+--
@@ -1,46 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 8 Nov 2022 12:41:22 +0000
-Subject: Disable Component Updates
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
- chrome/browser/component_updater/registration.cc          | 1 +
- components/component_updater/component_installer.cc       | 1 +
- components/component_updater/component_updater_service.cc | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
--- a/chrome/browser/component_updater/registration.cc
-+++ b/chrome/browser/component_updater/registration.cc
-@@ -99,6 +99,7 @@
- namespace component_updater {
- 
- void RegisterComponentsForUpdate() {
-+  if ((true)) return;
-   auto* const cus = g_browser_process->component_updater();
- 
- #if BUILDFLAG(IS_WIN)
-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
-@@ -99,6 +99,7 @@ void ComponentInstaller::Register(
-     base::OnceClosure callback,
-     const base::Version& registered_version,
-     const base::Version& max_previous_product_version) {
-+  if ((true)) return;
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-   if (!installer_policy_) {
-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
-@@ -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.
-  registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, false);
- }
- 
- }  // namespace component_updater
--
@@ -4,30 +4,62 @@ 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(-)
+ chrome/browser/BUILD.gn                             | 9 +++++++--
+ chrome/browser/ui/webui/settings/settings_ui.cc     | 2 +-
+ components/compose/core/browser/compose_features.cc | 2 ++
+ components/compose/features.gni                     | 2 +-
+ 4 files changed, 11 insertions(+), 4 deletions(-)

-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
-@@ -483,8 +483,10 @@ 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;
-+#endif
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
+@@ -8468,6 +8468,12 @@ static_library("browser") {
+     deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
+   }
 
-   // Clear browsing data settings.
-   (*s_allowlist)[browsing_data::prefs::kDeleteBrowsingHistory] =
+  if (!is_android) {
+    deps += [
+      ":compose_optimization_guide_proto",
+    ]
+  }
+
+   if (enable_compose) {
+     sources += [
+       "compose/chrome_compose_client.cc",
+@@ -8483,7 +8489,6 @@ static_library("browser") {
+     ]
+ 
+     deps += [
+-      ":compose_optimization_guide_proto",
+       "//chrome/common/compose",
+       "//chrome/common/compose:mojo_bindings",
+       "//components/autofill/content/browser",
+@@ -8943,7 +8948,7 @@ source_set("font_pref") {
+   deps = [ "//chrome/common" ]
+ }
+ 
+-if (enable_compose) {
+if (!is_android) {
+   proto_library("compose_optimization_guide_proto") {
+     sources = [ "compose/proto/compose_optimization_guide.proto" ]
+     cc_generator_options = "lite=true:"
+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
+@@ -352,7 +352,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+       base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
+ 
+ #if BUILDFLAG(ENABLE_COMPOSE)
+-  const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile);
+  const bool compose_enabled = false;
+   const bool compose_visible = ComposeEnabling::IsSettingVisible(profile);
+ #else
+   const bool compose_enabled = false;
 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
-@@ -73,4 +73,6 @@ BASE_FEATURE(kEnableNudgeForUnspecifiedHint,
-              "ComposeEnableNudgeForUnspecifiedHint",
+@@ -104,4 +104,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
+              "ComposeUpfrontInputModes",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
@@ -10,25 +10,21 @@ 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
-@@ -677,16 +677,18 @@
+@@ -1065,12 +1065,14 @@
       }
     },
     {
 -      name: "CompressionDictionaryTransport",
 +      name: "CompressionDictionaryTransport", // need to be disabled
-       base_feature: "none",
-       origin_trial_feature_name: "CompressionDictionaryTransportV2",
-       origin_trial_allows_third_party: true,
-       public: true,
 +      status: "experimental",
+       base_feature: "none",
+       public: true,
     },
     {
 -      name: "CompressionDictionaryTransportBackend",
 +      name: "CompressionDictionaryTransportBackend", // need to be disabled
+      status: "experimental",
       base_feature: "none",
       public: true,
-+      status: "experimental",
     },
-     {
-       name: "ComputedAccessibilityInfo",
 --
--- a/Show More
+++ b/Show More