[AUTO] Patches auto-rebase for master branch (#1485)

[AUTO] Patches auto-rebase for master branch

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,8 +22,6 @@ body:
           required: true
         - label: "I have searched the existing issues for my problem. This is a new ticket, NOT a duplicate or related to another open issue."
           required: true
-        - label: "I have read the [FAQs](https://github.com/uazo/cromite/blob/master/FAQ.md)."
-          required: true
         - label: "I have updated Cromite to the latest version. The bug is reproducible on this latest version."
           required: true
         - label: "This is a bug report about the Cromite browser; not the website nor F-Droid nor anything else."

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -24,8 +24,6 @@ body:
       options:
         - label: "I have read the [README](https://github.com/uazo/cromite/blob/master/README.md)"
           required: true
-        - label: "I have read the [FAQs](https://github.com/uazo/cromite/blob/master/FAQ.md)."
-          required: true
         - label: "I have searched [existing issues](https://github.com/uazo/cromite/issues) for my feature request. This is a new issue (NOT a duplicate) and is not related to another issue."
           required: true
         - label: "I have searched [wont fix issues](https://github.com/uazo/cromite/issues?q=label%3Awontfix) and this request is not among them"

.github/workflows/build-images.yaml

@@ -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
@@ -156,15 +179,15 @@ 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
           add-paths: |
             tools/under-control/*
-          commit-message: 'AUTOMATED - new files under control ${{ env.NEW_VERSION }}'
-          title: New files under control ${{ env.NEW_VERSION }}
+          commit-message: '[AUTO][FILECONTROL] - version ${{ env.NEW_VERSION }}'
+          title: '[AUTO][FILECONTROL] - version ${{ env.NEW_VERSION }}'
           body: ${{ env.MESSAGE }}
           delete-branch: true
           branch-suffix: short-commit-hash
@@ -180,8 +203,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 +214,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

.github/workflows/build_additional_targets.yaml

@@ -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\" skip_secondary_abi_for_cq = true 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\" skip_secondary_abi_for_cq = true 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

.github/workflows/build_cromite.yaml

@@ -172,9 +172,9 @@ jobs:
         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/
+        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
+        WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.22621.2428/Windows Kits/10/"
+        GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
         # compile in debug mode
         TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
         TARGET_OS: ${{ github.event.inputs.target_os }}
@@ -397,7 +397,7 @@ jobs:
           gn args out/lin64/ --list >out/lin64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/lin64 chrome
+          ninja -C out/lin64 chrome chrome_sandbox
 
           cp ../../cromite/build/RELEASE out/lin64
 

.github/workflows/check-git-apply.yaml

@@ -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 }}
@@ -147,8 +147,8 @@ jobs:
           #push-to-fork: uazo/cromite
           add-paths: |
             build/patches/*.patch
-          commit-message: 'AUTOMATED - git apply results'
-          title: Git apply result for ${{ env.BRANCH }} branch
+          commit-message: '[AUTO] Patches auto-rebase'
+          title: '[AUTO] Patches auto-rebase for ${{ env.BRANCH }} branch'
           body: ${{ env.MESSAGE }}
           delete-branch: true
           branch-suffix: short-commit-hash

.github/workflows/check_nist.yaml

@@ -56,7 +56,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 }}

.github/workflows/release.yaml

@@ -140,7 +140,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 +178,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/
 
@@ -193,9 +193,6 @@ jobs:
           $GH release upload $VERSION-$CROMITE_SHA arm64_symbols.zip
           echo "::endgroup::"
 
-          # workaround for https://github.com/cli/cli/issues/6599
-          sleep 30s
-
           TIMESTAMP=$(date +%s -r chrome-win.zip)
           echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$CROMITE_SHA"
           $GH release upload $VERSION-$CROMITE_SHA updateurl.txt

.github/workflows/release_additional_targets.yaml

@@ -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/SystemWebView64.apk arm64_SystemWebView64.apk
+          sudo chown runner arm64_SystemWebView64.apk
+
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebViewShell.apk arm64_SystemWebViewShell.apk
+          sudo chown runner arm64_SystemWebViewShell.apk
+
+          echo Uploading arm64_SystemWebView64
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebView64.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/SystemWebView64.apk x64_SystemWebView64.apk
+          sudo chown runner x64_SystemWebView64.apk
+
+          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebViewShell.apk x64_SystemWebViewShell.apk
+          sudo chown runner x64_SystemWebViewShell.apk
+
+          echo Uploading x64_SystemWebView64
+          $GH release upload $VERSION-$CROMITE_SHA x64_SystemWebView64.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::"

.github/workflows/update-patches-doc.yaml

@@ -13,8 +13,8 @@ permissions:
 
 on:
   push:
-    branches-ignore:
-      - 'ci'
+    branches:
+      - 'master'
     paths:
       - 'build/**'
 
@@ -67,16 +67,16 @@ 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
-          commit-message: 'AUTOMATED - update patch docs'
-          title: Generate patches doc for ${{ env.BRANCH }} branch
+            docs/*.md
+          commit-message: '[AUTO][DOC] Generate patches doc for master branch'
+          title: '[AUTO][DOC] Generate patches doc for master branch'
           body: ${{ env.MESSAGE }}
           delete-branch: true
           branch-suffix: short-commit-hash

.github/workflows/update_fdroid_repo.yaml

@@ -27,9 +27,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

README.md

@@ -14,7 +14,7 @@
 
 Cromite is a [Chromium](https://www.chromium.org/Home) fork based on [Bromite](https://github.com/bromite/bromite) with built-in support for ad blocking and an eye for privacy.
 
-Cromite is available for Android arm64-v8a, arm32-v7a and x86_64, 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, Nougat and above (Minimum v8.0, API level 26), Windows and Linux 64bit.
 
 # Goals
 
@@ -40,16 +40,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)
+
+#### Cromite System WebView apk for android:
+- [arm64_SystemWebView64.apk](https://github.com/uazo/cromite/releases/latest/download/arm64_SystemWebView64.apk)
+- [x64_SystemWebView64.apk](https://github.com/uazo/cromite/releases/latest/download/x64_SystemWebView64.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)
+
+Additional files are also available:
+
+#### 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
+
+#### 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
 
 ### 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 +105,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="C:\Users\<my user>\AppData\Local\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,11 +128,37 @@ 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
 ```
 
+### 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.
@@ -112,6 +180,8 @@ For any usage or development discussion please use GitHub Discussions: https://g
   * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (via ungoogled-chromium)
   * [Brave Browser](https://github.com/brave/brave-core) for some patches
 
+thanks to [austinhuang0131](https://github.com/austinhuang0131) for the svg icon
+
 # License
 
 Cromite is published under [GNU GPL v3](./LICENSE).

build/RELEASE

@@ -1 +1 @@
-123.0.6312.105
+129.0.6668.59

build/chromium.gn_args

@@ -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

build/cromite.gn_args

@@ -4,7 +4,6 @@ build_contextual_search=false
 build_with_tflite_lib=false
 chrome_pgo_phase=0
 dcheck_always_on=false
-debuggable_apks=false
 dfmify_dev_ui=false
 disable_android_lint=true
 disable_fieldtrial_testing_config=true
@@ -32,8 +31,6 @@ 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
 
@@ -82,7 +79,7 @@ use_relr_relocations=false
 use_v8_context_snapshot = false
 
 # enable libjxl support by default
-enable_jxl_decoder = true
+enable_jxl_decoder = false
 
 # disable minikin engine
 # see https://github.com/uazo/cromite/issues/697
@@ -92,6 +89,19 @@ use_minikin_hyphenation = false
 # initial commit: https://source.chromium.org/chromium/chromium/src/+/fd9a841f7a63b9f5510f6b713d9c833d259c63ad
 enable_bound_session_credentials = false
 
+# Use LogErrorNotReached() for NOTREACHED_IN_MIGRATION() 
+enable_log_error_not_reached = true
+
+# Allows building without //third_party/unrar included, for license reasons
+safe_browsing_use_unrar = false
+
+# 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 +109,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 +117,8 @@ if (target_os == "android") {
   system_webview_package_name="org.cromite.webview" #"com.android.webview"
   system_webview_shell_package_name="org.cromite.webview_shell"
 
+  chrome_pgo_phase = 2 # enable pgo
+
   if (getenv("USE_KEYSTORE") != "") {
     android_keystore_path = "/home/lg/working_dir/cromite.keystore"
     android_keystore_name = "cromite"

build/cromite_patches_list.txt

@@ -1,7 +1,11 @@
+Do-not-link-with-libatomic.patch
 bromite-build-utils.patch
+Add-cromite-flags-support.patch
+Fix-chromium-vanilla.patch
+Final-patch-for-chromium-vanilla.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
@@ -21,7 +25,7 @@ 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,13 +38,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
@@ -50,6 +51,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 +59,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 +70,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
@@ -98,7 +97,6 @@ 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
@@ -140,7 +138,6 @@ Re-introduce-override_build_timestamp.patch
 enable-ftrivial-auto-var-init-zero.patch
 disable-appending-variations-header.patch
 Disable-idle-detection.patch
-Allow-building-without-supervised-users.patch
 Disable-minidump-upload-scheduling.patch
 Revert-Permit-blocking-of-view-source.patch
 Disable-safety-check.patch
@@ -172,14 +169,12 @@ 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
 
+# cromite patches
 WIN-enable-pdf-plugin.patch
 WIN-disable-annotate-downloads.patch
 WIN-enable-HighEfficiencyMode-by-default.patch
@@ -201,7 +196,6 @@ 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
@@ -220,10 +214,8 @@ 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
@@ -236,6 +228,7 @@ Add-webGL-site-setting.patch
 Add-webRTC-site-settings.patch
 Show-site-settings-for-cookies-javascript-and-ads.patch
 Viewport-Protection-flag.patch
+Revert-remove-allowscript-content-setting-secondary-url.patch
 Timezone-customization.patch
 Change-popup-site-setting.patch
 Disable-speechSynthesis-getVoices-API.patch
@@ -243,7 +236,6 @@ Remove-support-for-device-memory-and-cpu-recovery.patch
 Log-dangling-attributes-in-some-html-elements.patch
 Keep-Side-Panel-Companion-disabled.patch
 Lock-Profile-Cookie-Database.patch
-Show-warnings-on-downloads-over-HTTP.patch
 Compress-libchrome-to-free-up-some-space.patch
 Cromite-Branding.patch
 Disable-Feeback-Collector.patch
@@ -259,7 +251,6 @@ 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
@@ -268,7 +259,6 @@ 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
@@ -284,18 +274,39 @@ 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
-Emoji-Fonts-fingerprinting-mitigation-02-02.patch
-Emoji-Fonts-fingerprinting-mitigation-01-02.patch
+Do-not-use-Windows-ClearType-Text-Tuner-setting.patch
+Private-network-access-content-settings.patch
+Allow-building-without-supervised-users.patch
+Keep-ComputePressure-disabled.patch
+Android-Toolbar-Scroll-Ablation-setting.patch
+Keep-disabled-WebViewMediaIntegrityApi.patch
+Enable-menu-on-reload-button.patch
+Enable-Global-Privacy-Control.patch
+Enable-Do-Not-Track-by-default.patch
+Media-fingerprinting-mitigations.patch
+Use-BoringSSL-for-RandBytes.patch
+Restore-chrome-password-store.patch
+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
 
+# 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
 Fix-chromium-build-bugs.patch
 
+# adblock patches
 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
+Eyeo-Adblock-for-Cromite.patch

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

@@ -90,8 +90,8 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3046,9 +3046,9 @@
-     "expiry_milestone": 125
+@@ -3406,9 +3406,9 @@
+     "expiry_milestone": 135
    },
    {
 -    "name": "enable-image-reader",
@@ -121,7 +121,7 @@ new file mode 100644
 diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
 --- a/gpu/config/gpu_driver_bug_list.json
 +++ b/gpu/config/gpu_driver_bug_list.json
-@@ -2689,6 +2689,22 @@
+@@ -2606,6 +2606,22 @@
          "no_downscaled_overlay_promotion"
        ]
      },
@@ -147,7 +147,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
+@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_ANDROID)
@@ -168,12 +168,12 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
  #if BUILDFLAG(IS_ANDROID)
 +GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
  GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kEnableGpuMemoryBufferImplAHB);
  GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReader);
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !BUILDFLAG(IS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -183,9 +183,9 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -368,6 +371,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
-     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
-         kGpuFeatureStatusBlocklisted;
+@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
+           kGpuFeatureStatusSoftware;
+     }
    }
 +
 +  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
@@ -198,8 +198,8 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
 --- a/gpu/config/gpu_workaround_list.txt
 +++ b/gpu/config/gpu_workaround_list.txt
-@@ -11,6 +11,7 @@ clamp_texture_base_level_and_max_level
- clear_pixel_unpack_buffer_before_copyteximage
+@@ -7,6 +7,7 @@ check_egl_fence_before_wait
+ check_ycbcr_studio_g22_left_p709_for_nv12_support
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
 +disable_aimagereader
@@ -209,7 +209,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
 diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -65,6 +65,7 @@
+@@ -68,6 +68,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "ui/gfx/android/android_surface_control_compat.h"
@@ -217,7 +217,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
  #endif
  
  #if BUILDFLAG(ENABLE_VULKAN)
-@@ -662,6 +663,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -702,6 +703,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -242,7 +242,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
  #include "base/android/scoped_hardware_buffer_fence_sync.h"
  #include "base/feature_list.h"
  #include "base/functional/bind.h"
-@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
+@@ -49,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
  }
  
  TextureOwner::Mode GetTextureOwnerMode() {

build/patches/Add-AllowUserCertificates-flag.patch

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -230,6 +230,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -232,6 +232,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,9 +28,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -1064,6 +1065,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-         super.onStartWithNative();
-         ChromeActivitySessionTracker.getInstance().onStartWithNative();
+@@ -1053,6 +1054,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ 
+         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
          ChromeCachedFlags.getInstance().cacheNativeFlags();
 +        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
-@@ -136,6 +136,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -157,6 +157,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
-     &feed::kFeedUserInteractionReliabilityReport,
 +    &kAllowUserCertificates,
      &feed::kInterestFeedV2,
      &feed::kInterestFeedV2Hearts,
-     &feed::kWebFeed,
+     &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
-@@ -141,6 +141,7 @@ public abstract class ChromeFeatureList {
-         return ChromeFeatureMap.getInstance().mutableFlagWithSafeDefault(featureName, defaultValue);
-     }
- 
+@@ -159,6 +159,7 @@ public abstract class ChromeFeatureList {
+     /* Alphabetical: */
+     public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
+             "AccountReauthenticationRecentTimeWindow";
 +    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 =
-@@ -533,6 +534,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidHub = newCachedFlag(ANDROID_HUB, false);
-     public static final CachedFlag sAndroidTabGroupStableIds =
-             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, false);
+@@ -572,6 +573,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
+             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
+     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
-     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
+     public static final CachedFlag sAsyncNotificationManager =
+             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
      public static final CachedFlag sBackGestureActivityTabProvider =
-             newCachedFlag(BACK_GESTURE_ACTIVITY_TAB_PROVIDER, false);
-@@ -679,6 +682,7 @@ public abstract class ChromeFeatureList {
- 
-     public static final List<CachedFlag> sFlagsCachedFullBrowser =
+@@ -725,6 +728,7 @@ public abstract class ChromeFeatureList {
+     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
              List.of(
+                     sAccountReauthenticationRecentTimeWindow,
 +                    sAllowUserCertificates,
                      sAndroidAppIntegration,
                      sAndroidElegantTextHeight,
-                     sAndroidHub,
+                     sAndroidGoogleSansText,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null

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

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -204,6 +204,8 @@ public class KeyboardShortcuts {
+@@ -392,6 +392,8 @@ public class KeyboardShortcuts {
                  R.string.keyboard_shortcut_address_bar,
                  KeyEvent.KEYCODE_L,
                  KeyEvent.META_CTRL_ON);

build/patches/Add-IsCleartextPermitted-flag.patch

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

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -6,27 +6,30 @@ 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                                     |  3 +++
+ base/features.cc                                     |  4 ++++
  chrome/browser/about_flags.cc                        |  1 +
  .../Add-PartialLowEndModeOnMidRangeDevices-flag.inc  | 12 ++++++++++++
- 3 files changed, 16 insertions(+)
+ 3 files changed, 17 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
-@@ -67,4 +67,7 @@ BASE_FEATURE(kCollectAndroidFrameTimelineMetrics,
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -109,6 +109,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
+              FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
  
 +#if BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
 +#endif
- }  // namespace base::features
++
+ 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 @@
+@@ -21,6 +21,7 @@
  #include "base/base_switches.h"
  #include "base/command_line.h"
  #include "base/feature_list.h"

build/patches/Add-a-GN-flag-to-disable-trybot-verification.patch

@@ -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")
+--

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

@@ -14,8 +14,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7195,9 +7195,9 @@
-     "expiry_milestone": 125
+@@ -7908,9 +7908,9 @@
+     "expiry_milestone": 130
    },
    {
 -    "name": "restrict-gamepad-access",
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3089,7 +3089,7 @@ const char kResetShortcutCustomizationsDescription[] =
+@@ -3298,7 +3298,7 @@ const char kResetShortcutCustomizationsDescription[] =
  
  const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
  const char kRestrictGamepadAccessDescription[] =
@@ -37,11 +37,11 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 +    "Disable the Gamepad "
      "API";
  
- const char kRoundedDisplay[] = "Rounded display";
+ const char kRippleForEnhancedProtectionName[] =
 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() {
+@@ -64,4 +64,5 @@ bool IsGamepadMultitouchEnabled() {
    return false;
  }
  
@@ -50,7 +50,7 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ
 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(
+@@ -118,6 +118,10 @@ void RecordGamepadsForIdentifiabilityStudy(
  HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
      Navigator& navigator,
      ExceptionState& exception_state) {
@@ -61,7 +61,7 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
    if (!navigator.DomWindow()) {
      // Using an existing NavigatorGamepad if one exists, but don't create one
      // for a detached window, as its subclasses depend on a non-null window.
-@@ -435,6 +439,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
+@@ -440,6 +444,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
  
  void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
                                              Gamepad* gamepad) {

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

@@ -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 +-
@@ -30,17 +30,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
  chrome/browser/ui/BUILD.gn                    |   2 +
  .../webui/chrome_web_ui_controller_factory.cc |   3 +
- chrome/browser/ui/webui/proxy_config_ui.cc    | 393 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
  chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++
- chrome/common/webui_url_constants.cc          |   4 +
+ 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          |  52 ++-
+ net/proxy_resolution/proxy_config.cc          |  51 ++-
  net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 981 insertions(+), 17 deletions(-)
+ 25 files changed, 973 insertions(+), 17 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -25,6 +25,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,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -76,6 +76,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -73,6 +73,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private static final String PREF_SAFE_BROWSING = "safe_browsing";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -88,19 +88,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -308,6 +308,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
-   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
+@@ -319,6 +319,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
-@@ -237,6 +237,9 @@
+@@ -244,6 +244,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>
@@ -113,7 +112,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
-@@ -387,7 +387,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
+@@ -392,7 +392,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
          return std::nullopt;
        }
        return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -197,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -191,6 +191,8 @@
+@@ -201,6 +201,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
  
@@ -206,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1447,6 +1449,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1496,6 +1498,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -661,7 +660,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -301,6 +301,8 @@ static_library("ui") {
+@@ -336,6 +336,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -673,7 +672,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -52,6 +52,7 @@
+@@ -50,6 +50,7 @@
  #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
  #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
  #include "chrome/browser/ui/webui/policy/policy_ui.h"
@@ -681,8 +680,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
  #include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
  #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
-@@ -469,6 +470,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
-     return &NewWebUI<MetricsInternalsUI>;
+@@ -419,6 +420,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
 +  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
@@ -694,7 +693,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,393 @@
+@@ -0,0 +1,389 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -756,7 +755,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 +792,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();
@@ -895,8 +891,7 @@ new file mode 100644
 +      state.SetByDottedPath("config.rules.fallback_proxies", base::Value(omitDirect(rules.fallback_proxies.ToPacString())));
 +      break;
 +    default:
-+     NOTREACHED();
-+     break;
++     NOTREACHED_NORETURN();
 +  }
 +  state.SetByDottedPath("config.rules.type", base::Value(type));
 +  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));
@@ -978,7 +973,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 +1033,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);
@@ -1127,16 +1122,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -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";
-@@ -460,6 +462,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {
        kChromeUILockScreenNetworkHost,
        kChromeUILockScreenStartReauthHost,
        kChromeUIMobileSetupHost,
@@ -1144,26 +1130,26 @@ 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[] = {
+@@ -75,6 +76,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+ // These hosts will also be suggested by BuiltinProvider.
+ base::span<const base::cstring_view> ChromeURLHosts() {
+   static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
++      kChromeUIProxyConfigHost,
+       kChromeUIAboutHost,
+       kChromeUIAccessibilityHost,
  #if !BUILDFLAG(IS_ANDROID)
- #if !BUILDFLAG(IS_CHROMEOS)
-     kChromeUIAppLauncherPageHost,
-+    kChromeUIProxyConfigHost,
- #endif
-     kChromeUIBookmarksHost,
-     kChromeUIDownloadsHost,
 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
-@@ -134,6 +134,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[];
+@@ -171,6 +171,8 @@ inline constexpr char kChromeUINetExportURL[] = "chrome://net-export";
+ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+ inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
+ inline constexpr char kChromeUINewTabHost[] = "newtab";
++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
@@ -1321,7 +1307,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,
+@@ -381,7 +381,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
          set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
              server->GetString(), bypass_list && bypass_list->is_string()
                                       ? bypass_list->GetString()
@@ -1342,16 +1328,11 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
        }
  
        // Trim whitespace off the url scheme.
-@@ -140,6 +140,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -140,6 +140,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
    }
  }
  
 +std::string ProxyConfig::ProxyRules::ToString() const {
-+  if (type == Type::EMPTY) {
-+    return "";
-+  }
-+
-+  // special case: a single proxy servers list specified
 +  if (type == Type::PROXY_LIST) {
 +    std::string proxy_list;
 +    for (const auto& proxy_chain : single_proxies.AllChains()) {
@@ -1363,37 +1344,41 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +      proxy_list.pop_back();
 +    }
 +    return proxy_list;
-+  }
-+
-+  if (type != Type::PROXY_LIST_PER_SCHEME) {
-+    NOTREACHED();
-+    // Unexpected LIST with fallback, or other type values
++  } else if (type == Type::PROXY_LIST_PER_SCHEME) {
++    // start to build a per-scheme list
++    std::string list;
++    for (const auto& proxy_chain : proxies_for_http.AllChains()) {
++      if (proxy_chain.length()) {
++        net::ProxyServer proxy_server = proxy_chain.First();
++        list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
++      }
++    }
++    for (const auto& proxy_chain : proxies_for_https.AllChains()) {
++      if (proxy_chain.length()) {
++        net::ProxyServer proxy_server = proxy_chain.First();
++        list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
++      }
++    }
++    for (const auto& proxy_chain : proxies_for_ftp.AllChains()) {
++      if (proxy_chain.length()) {
++        net::ProxyServer proxy_server = proxy_chain.First();
++        list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
++      }
++    }
++    for (const auto& proxy_chain : fallback_proxies.AllChains()) {
++      if (proxy_chain.length()) {
++        net::ProxyServer proxy_server = proxy_chain.First();
++        list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
++      }
++    }
++    if (list.length() != 0 ) {
++      // remove last semicolon
++      list.pop_back();
++    }
++    return list;
++  } else {
 +    return "";
 +  }
-+
-+  // start to build a per-scheme list
-+  std::string list;
-+  for (const auto& proxy_chain : proxies_for_http.AllChains()) {
-+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+    list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
-+  }
-+  for (const auto& proxy_chain : proxies_for_https.AllChains()) {
-+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+    list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
-+  }
-+  for (const auto& proxy_chain : proxies_for_ftp.AllChains()) {
-+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+    list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
-+  }
-+  for (const auto& proxy_chain : fallback_proxies.AllChains()) {
-+    net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+    list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
-+  }
-+  if (list.length() != 0 ) {
-+    // remove last semicolon
-+    list.pop_back();
-+  }
-+  return list;
 +}
 +
  const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(

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

@@ -279,7 +279,7 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -255,7 +255,7 @@ void ContentSettingsRegistry::Init() {
+@@ -248,7 +248,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
@@ -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 @@
- #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h"
+@@ -9,6 +9,7 @@
+ #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h"
  #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.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() {
+@@ -338,6 +339,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() {
+@@ -450,6 +453,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
-@@ -138,6 +138,10 @@ class CORE_EXPORT AutoplayPolicy final
+@@ -151,6 +151,10 @@ class CORE_EXPORT AutoplayPolicy final
    // should use, if checking to see if an action is allowed.
    bool IsLockedPendingUserGesture() const;
  

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

@@ -6,28 +6,28 @@ Add bookmark import/export actions in bookmarks activity and page
 Reduce permissions needed for bookmarks import/export
 Completely remove contacts picker permission from the file dialog
 
-Requires patch: Adds-support-for-writing-URIs.patch
+Requires: Adds-support-for-writing-URIs.patch
+Requires: Restore-BookmarkToolbar-setCurrentFolder.patch
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/AndroidManifest.xml       |   1 -
- .../java/res/menu/bookmark_toolbar_menu.xml   |  14 +
  .../menu/bookmark_toolbar_menu_improved.xml   |  14 +
  .../browser/TabbedModeTabDelegateFactory.java |   5 +-
  .../app/bookmarks/BookmarkActivity.java       |  32 ++
- .../browser/bookmarks/BookmarkBridge.java     | 285 +++++++++++++++++
+ .../browser/bookmarks/BookmarkBridge.java     | 285 ++++++++++++++++++
  .../browser/bookmarks/BookmarkDelegate.java   |  10 +
  .../bookmarks/BookmarkManagerCoordinator.java |   9 +
  .../bookmarks/BookmarkManagerMediator.java    |  23 ++
  .../browser/bookmarks/BookmarkPage.java       |   8 +-
- .../browser/bookmarks/BookmarkToolbar.java    |  23 ++
+ .../browser/bookmarks/BookmarkToolbar.java    |  28 ++
  .../bookmarks/BookmarkToolbarMediator.java    |   4 +
  .../bookmarks/BookmarkToolbarProperties.java  |   8 +-
  .../bookmarks/BookmarkToolbarViewBinder.java  |   6 +
  .../native_page/NativePageFactory.java        |  11 +-
  chrome/browser/BUILD.gn                       |  11 +-
- .../bookmarks/android/bookmark_bridge.cc      | 287 ++++++++++++++++++
- .../bookmarks/android/bookmark_bridge.h       |  30 +-
+ .../bookmarks/android/bookmark_bridge.cc      | 282 +++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.h       |  29 +-
  .../browser/bookmarks/bookmark_html_writer.cc |  11 +
  .../dialogs/DownloadLocationCustomView.java   |   8 +-
  .../DownloadLocationDialogCoordinator.java    |  10 +-
@@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
  ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
  ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 43 files changed, 928 insertions(+), 30 deletions(-)
+ 42 files changed, 913 insertions(+), 30 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -69,30 +69,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
      <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
  
-diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
---- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
-+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
-@@ -23,6 +23,20 @@ found in the LICENSE file.
-             android:visible="false"
-             app:showAsAction="ifRoom"
-             app:iconTint="@color/default_icon_color_secondary_tint_list" />
-+        <item
-+            android:id="@+id/import_menu_id"
-+            android:icon="@drawable/ic_folder_blue_24dp"
-+            android:title="@string/import_bookmarks"
-+            android:visible="true"
-+            app:showAsAction="ifRoom"
-+            app:iconTint="@color/default_icon_color_tint_list" />
-+        <item
-+            android:id="@+id/export_menu_id"
-+            android:icon="@drawable/ic_file_download_white_24dp"
-+            android:title="@string/export_bookmarks"
-+            android:visible="true"
-+            app:showAsAction="ifRoom"
-+            app:iconTint="@color/default_icon_color_tint_list" />
-         <item
-             android:id="@+id/close_menu_id"
-             android:icon="@drawable/btn_close"
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
@@ -128,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
  import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-@@ -53,7 +54,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
+@@ -54,7 +55,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
   * {@link ChromeTabbedActivity}.
   */
  public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -137,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
      private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
      private final Supplier<ShareDelegate> mShareDelegateSupplier;
      private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
-@@ -82,7 +83,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+@@ -83,7 +84,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
      private NativePageFactory mNativePageFactory;
  
      public TabbedModeTabDelegateFactory(
@@ -270,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  /**
   * Provides the communication channel for Android to fetch and manipulate the bookmark model stored
   * in native.
-@@ -483,6 +525,212 @@ class BookmarkBridge {
+@@ -474,6 +516,212 @@ class BookmarkBridge {
                  .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType());
      }
  
@@ -483,8 +459,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       *
-@@ -1036,6 +1284,39 @@ class BookmarkBridge {
-         depthList.add(depth);
+@@ -1032,6 +1280,39 @@ class BookmarkBridge {
+         BookmarkUtils.clearLastUsedPrefs();
      }
  
 +    @CalledByNative
@@ -557,7 +533,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -48,6 +48,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
+@@ -49,6 +49,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
  import org.chromium.components.image_fetcher.ImageFetcherConfig;
  import org.chromium.components.image_fetcher.ImageFetcherFactory;
  import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -566,7 +542,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-@@ -326,6 +328,13 @@ public class BookmarkManagerCoordinator
+@@ -302,6 +304,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -584,15 +560,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 @@ -53,6 +53,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
- import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
  import org.chromium.components.commerce.core.CommerceSubscription;
  import org.chromium.components.commerce.core.ShoppingService;
+ import org.chromium.components.commerce.core.SubscriptionsObserver;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.components.favicon.LargeIconBridge;
- import org.chromium.components.feature_engagement.EventConstants;
  import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
-@@ -82,6 +84,9 @@ class BookmarkManagerMediator
+ import org.chromium.components.power_bookmarks.PowerBookmarkType;
+@@ -81,6 +83,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -602,7 +578,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /** Keeps track of whether drag is enabled / active for bookmark lists. */
      private class BookmarkDragStateDelegate implements DragStateDelegate {
          private BookmarkDelegate mBookmarkDelegate;
-@@ -554,6 +559,14 @@ class BookmarkManagerMediator
+@@ -544,6 +549,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -617,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /** See BookmarkManager(Coordinator)#updateForUrl */
      void updateForUrl(String url) {
          // Bookmark model is null if the manager has been destroyed.
-@@ -734,6 +747,16 @@ class BookmarkManagerMediator
+@@ -724,6 +737,16 @@ class BookmarkManagerMediator
          }
      }
  
@@ -669,7 +645,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -120,6 +120,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -101,6 +101,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
          setOnMenuItemClickListener(dragEnabled ? null : this);
      }
  
@@ -684,19 +660,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mExportBookmarkRunnable = runnable;
 +    }
 +
-     void setSearchButtonVisible(boolean visible) {
-         // The improved bookmarks experience embeds search in the list.
-         if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) return;
-@@ -173,6 +184,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+     void setEditButtonVisible(boolean visible) {
+         mEditButtonVisible = visible;
+         getMenu().findItem(R.id.edit_menu_id).setVisible(visible);
+@@ -177,6 +188,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
  
      void setCurrentFolder(BookmarkId folder) {
          mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
++        enableImportExportMenu();
++    }
++
++    void enableImportExportMenu() {
 +        getMenu().findItem(R.id.import_menu_id).setVisible(true);
 +        getMenu().findItem(R.id.export_menu_id).setVisible(true);
++    }
      }
  
      void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -192,6 +205,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -196,6 +214,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      @Override
      public boolean onMenuItemClick(MenuItem menuItem) {
          hideOverflowMenu();
@@ -710,7 +691,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          return mMenuIdClickedFunction.apply(menuItem.getItemId());
      }
  
-@@ -212,6 +232,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -211,6 +236,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      protected void showNormalView() {
          super.showNormalView();
  
@@ -718,8 +699,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
 +
          // SelectableListToolbar will show/hide the entire group.
-         setSearchButtonVisible(mSearchButtonVisible);
          setEditButtonVisible(mEditButtonVisible);
+         setNewFolderButtonVisible(mNewFolderButtonVisible);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
@@ -737,7 +718,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarProperties.java
-@@ -69,6 +69,10 @@ class BookmarkToolbarProperties {
+@@ -81,6 +81,10 @@ class BookmarkToolbarProperties {
  
      static final WritableObjectPropertyKey<Runnable> NAVIGATE_BACK_RUNNABLE =
              new WritableObjectPropertyKey<>();
@@ -747,13 +728,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +            new WritableObjectPropertyKey<>();
  
      static final PropertyKey[] ALL_KEYS = {
-         BOOKMARK_MODEL,
-@@ -91,6 +95,8 @@ class BookmarkToolbarProperties {
-         CHECKED_VIEW_MENU_ID,
-         MENU_ID_CLICKED_FUNCTION,
-         NAVIGATE_BACK_RUNNABLE,
--        FAKE_SELECTION_STATE_CHANGE
-+        FAKE_SELECTION_STATE_CHANGE,
+         BOOKMARK_OPENER,
+@@ -109,6 +113,8 @@ class BookmarkToolbarProperties {
+         SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO,
+         SELECTION_MODE_SHOW_MOVE,
+         SELECTION_MODE_SHOW_MARK_READ,
+-        SELECTION_MODE_SHOW_MARK_UNREAD
++        SELECTION_MODE_SHOW_MARK_UNREAD,
 +        IMPORT_BOOKMARK_RUNNABLE,
 +        EXPORT_BOOKMARK_RUNNABLE
      };
@@ -761,7 +742,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarViewBinder.java
-@@ -59,6 +59,12 @@ class BookmarkToolbarViewBinder {
+@@ -56,6 +56,12 @@ class BookmarkToolbarViewBinder {
                      model.get(BookmarkToolbarProperties.CHECKED_VIEW_MENU_ID));
          } else if (key == BookmarkToolbarProperties.CURRENT_FOLDER) {
              bookmarkToolbar.setCurrentFolder(model.get(BookmarkToolbarProperties.CURRENT_FOLDER));
@@ -777,15 +758,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -17,6 +17,7 @@ import org.chromium.base.supplier.DestroyableObservableSupplier;
- import org.chromium.base.supplier.ObservableSupplier;
+@@ -18,6 +18,7 @@ import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.Supplier;
+ import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
  import org.chromium.chrome.browser.bookmarks.BookmarkPage;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier;
-@@ -54,7 +55,7 @@ import org.chromium.ui.util.ColorUtils;
+@@ -57,7 +58,7 @@ import org.chromium.ui.util.ColorUtils;
   * Creates NativePage objects to show chrome-native:// URLs using the native Android view system.
   */
  public class NativePageFactory {
@@ -794,8 +775,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
      private final BottomSheetController mBottomSheetController;
      private final BrowserControlsManager mBrowserControlsManager;
      private final Supplier<Tab> mCurrentTabSupplier;
-@@ -74,7 +75,7 @@ public class NativePageFactory {
-     private NativePageBuilder mNativePageBuilder;
+@@ -78,7 +79,7 @@ public class NativePageFactory {
+     private static NativePage sTestPage;
  
      public NativePageFactory(
 -            @NonNull Activity activity,
@@ -803,7 +784,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
              @NonNull BottomSheetController sheetController,
              @NonNull BrowserControlsManager browserControlsManager,
              @NonNull Supplier<Tab> currentTabSupplier,
-@@ -140,7 +141,7 @@ public class NativePageFactory {
+@@ -144,7 +145,7 @@ public class NativePageFactory {
  
      @VisibleForTesting
      static class NativePageBuilder {
@@ -812,7 +793,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
          private final BottomSheetController mBottomSheetController;
          private final Supplier<NewTabPageUma> mUma;
          private final BrowserControlsManager mBrowserControlsManager;
-@@ -158,7 +159,7 @@ public class NativePageFactory {
+@@ -162,7 +163,7 @@ public class NativePageFactory {
          private final OneshotSupplier<ModuleRegistry> mModuleRegistrySupplier;
  
          public NativePageBuilder(
@@ -821,7 +802,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
                  Supplier<NewTabPageUma> uma,
                  BottomSheetController sheetController,
                  BrowserControlsManager browserControlsManager,
-@@ -228,7 +229,7 @@ public class NativePageFactory {
+@@ -233,7 +234,7 @@ public class NativePageFactory {
                      mActivity.getComponentName(),
                      mSnackbarManagerSupplier.get(),
                      tab.getProfile(),
@@ -833,7 +814,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -201,6 +201,8 @@ static_library("browser") {
+@@ -200,6 +200,8 @@ static_library("browser") {
      "bluetooth/chrome_bluetooth_delegate_impl_client.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -842,9 +823,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/chrome_bookmark_client.cc",
      "bookmarks/chrome_bookmark_client.h",
      "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1935,6 +1937,13 @@ static_library("browser") {
-     ]
-   }
+@@ -1785,6 +1787,13 @@ static_library("browser") {
+     "webid/identity_provider_permission_request.h",
+   ]
  
 +  if (is_android) {
 +    sources += [
@@ -856,10 +837,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3649,8 +3658,6 @@ static_library("browser") {
-       "badging/badge_manager_factory.h",
-       "banners/app_banner_manager_desktop.cc",
-       "banners/app_banner_manager_desktop.h",
+@@ -3476,8 +3485,6 @@ static_library("browser") {
+       "bookmarks/bookmark_expanded_state_tracker.h",
+       "bookmarks/bookmark_expanded_state_tracker_factory.cc",
+       "bookmarks/bookmark_expanded_state_tracker_factory.h",
 -      "bookmarks/bookmark_html_writer.cc",
 -      "bookmarks/bookmark_html_writer.h",
        "bookmarks/url_and_id.h",
@@ -868,9 +849,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -59,6 +59,28 @@
- #include "content/public/browser/browser_thread.h"
+@@ -64,6 +64,28 @@
  #include "content/public/browser/web_contents.h"
+ #include "url/gurl.h"
  
 +#include "base/android/content_uri_utils.h"
 +#include "base/android/path_utils.h"
@@ -894,10 +875,10 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +#include "ui/shell_dialogs/selected_file_info.h"
 +#include "ui/shell_dialogs/select_file_dialog.h"
 +
- using base::android::AttachCurrentThread;
- using base::android::ConvertUTF16ToJavaString;
- using base::android::ConvertUTF8ToJavaString;
-@@ -76,12 +98,96 @@ using bookmarks::android::JavaBookmarkIdGetType;
+ // Must come after all headers that specialize FromJniType() / ToJniType().
+ #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h"
+ 
+@@ -82,12 +104,97 @@ using bookmarks::android::JavaBookmarkIdGetType;
  using content::BrowserThread;
  using power_bookmarks::PowerBookmarkMeta;
  
@@ -929,14 +910,15 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +      return true;
 +
 +    GURL fixed_url(url_formatter::FixupURL(url.spec(), std::string()));
-+    for (size_t i = 0; i < chrome::kNumberOfChromeHostURLs; ++i) {
-+      if (fixed_url.DomainIs(chrome::kChromeHostURLs[i]))
++    const base::span<const base::cstring_view> hosts = chrome::ChromeURLHosts();
++    for (const base::cstring_view host : hosts) {
++      if (fixed_url.DomainIs(host)) {
 +        return true;
++      }
 +    }
 +
-+    for (size_t i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
-+      if (fixed_url == chrome::kChromeDebugURLs[i])
-+        return true;
++    if (base::Contains(chrome::ChromeDebugURLs(), fixed_url)) {
++      return true;
 +    }
 +
 +    // If url has either chrome:// or about: schemes but wasn't found in the
@@ -994,7 +976,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  class BookmarkTitleComparer {
   public:
    explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -232,6 +338,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -228,6 +335,10 @@ BookmarkBridge::~BookmarkBridge() {
    partner_bookmarks_shim_observation_.Reset();
    bookmark_model_observation_.Reset();
    profile_observation_.Reset();
@@ -1004,8 +986,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    select_file_dialog_->ListenerDestroyed();
  }
  
- void BookmarkBridge::Destroy(JNIEnv*) {
-@@ -668,6 +778,183 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+ void BookmarkBridge::Destroy(JNIEnv* env) {
+@@ -767,6 +878,177 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -1026,10 +1008,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +  ui::SelectFileDialog::FileTypeInfo file_type_info;
 +
 +  const std::vector<std::u16string> v_accept_types = { u"text/html" };
-+
-+  // Android needs the original MIME types and an additional capture value.
-+  std::pair<std::vector<std::u16string>, bool> accept_types =
-+      std::make_pair(v_accept_types, /* use_media_capture */ false);
++  select_file_dialog_->SetAcceptTypes(v_accept_types);
 +
 +  select_file_dialog_->SelectFile(
 +        ui::SelectFileDialog::SELECT_OPEN_FILE,
@@ -1038,8 +1017,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +        &file_type_info,
 +        0,
 +        base::FilePath::StringType(),
-+        window,
-+        &accept_types
++        window
 +  );
 +}
 +
@@ -1087,8 +1065,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +  return std::make_unique<TemplateURL>(data);
 +}
 +
-+void BookmarkBridge::FileSelected(const ui::SelectedFileInfo& file, int index,
-+                            void* params) {
++void BookmarkBridge::FileSelected(const ui::SelectedFileInfo& file, int index) {
 +  base::FilePath path = file.path();
 +  base::ThreadPool::PostTaskAndReplyWithResult(
 +      FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()},
@@ -1103,7 +1080,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +const std::string BookmarkBridge::FileSelectedImpl(const base::FilePath& path) {
 +  base::File file;
 +  if (path.IsContentUri()) {
-+    file = base::OpenContentUriForRead(path);
++    file = base::OpenContentUri(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
 +  } else {
 +    file.Initialize(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
 +  }
@@ -1183,8 +1160,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +  LOG(INFO) << result;
 +}
 +
-+void BookmarkBridge::FileSelectionCanceled(void* params) {
-+}
++void BookmarkBridge::FileSelectionCanceled() {}
 +
  void BookmarkBridge::SetBookmarkTitle(JNIEnv* env,
                                        jlong id,
@@ -1192,16 +1168,16 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.h
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
+ #include "base/strings/utf_string_conversions.h"
  #include "base/supports_user_data.h"
  #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
- #include "chrome/browser/image_service/image_service_factory.h"
 +#include "chrome/browser/bookmarks/bookmark_html_writer.h"
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/profiles/profile_observer.h"
  #include "chrome/browser/reading_list/android/reading_list_manager.h"
-@@ -33,6 +34,9 @@
- #include "components/prefs/pref_change_registrar.h"
+@@ -37,6 +38,9 @@
+ #include "components/signin/public/identity_manager/identity_manager.h"
  #include "url/android/gurl_android.h"
  
 +#include "components/search_engines/template_url.h"
@@ -1210,30 +1186,29 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
  class BookmarkBridgeTest;
  
  // The delegate to fetch bookmarks information for the Android native
-@@ -44,7 +48,8 @@ class BookmarkBridge : public ProfileObserver,
-                        public bookmarks::BaseBookmarkModelObserver,
-                        public PartnerBookmarksShim::Observer,
+@@ -50,7 +54,8 @@ class BookmarkBridge : public ProfileObserver,
                         public ReadingListManager::Observer,
+                        public ReadingListModelObserver,
+                        public signin::IdentityManager::Observer,
 -                       public base::SupportsUserData::Data {
 +                       public base::SupportsUserData::Data,
 +                       public ui::SelectFileDialog::Listener {
   public:
-   BookmarkBridge(
-       Profile* profile,
-@@ -81,6 +86,12 @@ class BookmarkBridge : public ProfileObserver,
+   // All of the injected pointers must be non-null and must outlive `this`.
+   BookmarkBridge(Profile* profile,
+@@ -81,6 +86,11 @@ class BookmarkBridge : public ProfileObserver,
  
    bool IsDoingExtensiveChanges(JNIEnv* env);
  
 +  // SelectFileDialog::Listener implementation.
 +  void FileSelected(const ui::SelectedFileInfo& file,
-+                    int index,
-+                    void* params) override;
-+  void FileSelectionCanceled(void* params) override;
++                    int index) override;
++  void FileSelectionCanceled() override;
 +
    jboolean IsEditBookmarksEnabled(JNIEnv* env);
  
    void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env);
-@@ -93,6 +104,15 @@ class BookmarkBridge : public ProfileObserver,
+@@ -93,6 +103,15 @@ class BookmarkBridge : public ProfileObserver,
                                                               jlong id,
                                                               jint type);
  
@@ -1249,16 +1224,17 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    void GetAllFoldersWithDepths(
        JNIEnv* env,
        const base::android::JavaParamRef<jobject>& j_folders_obj,
-@@ -356,12 +376,16 @@ class BookmarkBridge : public ProfileObserver,
-   void DestroyJavaObject();
+@@ -363,6 +382,9 @@ class BookmarkBridge : public ProfileObserver,
+   void CreateOrDestroyAccountReadingListManagerIfNeeded();
  
-   raw_ptr<Profile> profile_;  // weak
+   const raw_ptr<Profile> profile_;  // weak
 +  base::FilePath export_path_;
 +  raw_ptr<BookmarksExportObserver> observer_; // weak
 +
    base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
-   raw_ptr<bookmarks::BookmarkModel> bookmark_model_;                     // weak
-   raw_ptr<bookmarks::ManagedBookmarkService> managed_bookmark_service_;  // weak
+   const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
+   const raw_ptr<bookmarks::ManagedBookmarkService>
+@@ -377,6 +399,7 @@ class BookmarkBridge : public ProfileObserver,
    std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
        grouped_bookmark_actions_;
    PrefChangeRegistrar pref_change_registrar_;
@@ -1266,7 +1242,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
  
    // Information about the Partner bookmarks (must check for IsLoaded()).
    // This is owned by profile.
-@@ -389,6 +413,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -408,6 +431,10 @@ class BookmarkBridge : public ProfileObserver,
  
    bool suppress_observer_notifications_ = false;
  
@@ -1348,7 +1324,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
 --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
 +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationDialogCoordinator.java
-@@ -37,18 +37,18 @@ import java.util.ArrayList;
+@@ -38,18 +38,18 @@ import java.util.ArrayList;
   */
  public class DownloadLocationDialogCoordinator implements ModalDialogProperties.Controller {
      @NonNull private DownloadLocationDialogController mController;
@@ -1371,7 +1347,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
      private boolean mLocationDialogManaged;
  
      /**
-@@ -140,7 +140,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
+@@ -141,7 +141,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
       * Called after retrieved the download directory options.
       * @param dirs An list of available download directories.
       */
@@ -1383,21 +1359,21 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -176,6 +176,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -200,6 +200,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCacheActivityTaskID,
      &kCastDeviceFilter,
-     &kClearOmniboxFocusAfterNavigation,
+     &kCCTAuthTab,
 +    &kBookmarksExportUseSaf,
-     &kCreateNewTabInitializeRenderer,
-     &kCCTBrandTransparencyMemoryImprovement,
+     &kCCTBeforeUnload,
      &kCCTClientDataHeader,
+     &kCCTExtendTrustedCdnPublisher,
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -502,6 +502,7 @@ public abstract class ChromeFeatureList {
-     public static final String USER_BYPASS_UI = "UserBypassUI";
+@@ -530,6 +530,7 @@ public abstract class ChromeFeatureList {
      public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =
              "VerticalAutomotiveBackButtonToolbar";
+     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
      public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
      public static final String WEB_APK_ALLOW_ICON_UPDATE = "WebApkAllowIconUpdate";
@@ -1455,9 +1431,9 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 +    public static final String BOOKMARKS_LAST_EXPORT_URI =
 +            "Chrome.Bookmarks.Last_Export_Uri";
  
-     /**
-      * Whether Chrome is set as the default browser.
-@@ -894,6 +896,7 @@ public final class ChromePreferenceKeys {
+     /** Whether Chrome is set as the default browser. Default value is false. */
+     public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
+@@ -920,6 +922,7 @@ public final class ChromePreferenceKeys {
                  AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1468,7 +1444,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
-@@ -248,6 +248,24 @@ CHAR_LIMIT guidelines:
+@@ -246,6 +246,24 @@ CHAR_LIMIT guidelines:
        <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
          Sites
        </message>
@@ -1496,7 +1472,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -404,6 +404,9 @@ static_library("common_lib") {
+@@ -355,6 +355,9 @@ static_library("common_lib") {
      sources += [
        "media/chrome_media_drm_bridge_client.cc",
        "media/chrome_media_drm_bridge_client.h",
@@ -1509,7 +1485,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -84,8 +84,6 @@ static_library("utility") {
+@@ -89,8 +89,6 @@ static_library("utility") {
  
    if (!is_android) {
      sources += [
@@ -1518,7 +1494,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
        "importer/bookmarks_file_importer.cc",
        "importer/bookmarks_file_importer.h",
        "importer/external_process_importer_bridge.cc",
-@@ -220,6 +218,11 @@ static_library("utility") {
+@@ -225,6 +223,11 @@ static_library("utility") {
      ]
    }
  
@@ -1634,7 +1610,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
 diff --git a/components/headless/select_file_dialog/headless_select_file_dialog.cc b/components/headless/select_file_dialog/headless_select_file_dialog.cc
 --- a/components/headless/select_file_dialog/headless_select_file_dialog.cc
 +++ b/components/headless/select_file_dialog/headless_select_file_dialog.cc
-@@ -58,6 +58,10 @@ class HeadlessSelectFileDialog : public ui::SelectFileDialog {
+@@ -57,6 +57,10 @@ class HeadlessSelectFileDialog : public ui::SelectFileDialog {
    // ui::SelectFileDialog:
    bool HasMultipleFileTypeChoicesImpl() override { return false; }
  
@@ -1696,7 +1672,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      private static final String AUDIO_TYPE = "audio";
      private static final String ALL_TYPES = "*/*";
  
-@@ -306,6 +308,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -307,6 +309,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          ResettersForTesting.register(() -> mFileTypes = oldValue);
      }
  
@@ -1707,8 +1683,8 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
 +
      /**
       * Creates and starts an intent based on the passed fileTypes and capture value.
-      * @param fileTypes MIME types requested (i.e. "image/*")
-@@ -332,7 +339,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+      *
+@@ -343,7 +350,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          List<String> missingPermissions = new ArrayList<>();
          String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
          boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1717,7 +1693,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
              // The permission scenario for accessing media has evolved a bit over the years:
              // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
              // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
-@@ -385,7 +392,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -396,7 +403,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
  
                                  // TODO(finnur): Remove once we figure out the cause of
                                  // crbug.com/950024.
@@ -1726,7 +1702,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                      if (permissions.length != requestPermissions.length) {
                                          throw new RuntimeException(
                                                  String.format(
-@@ -402,7 +409,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -413,7 +420,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                                      }
                                  }
  
@@ -1735,7 +1711,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                      if (permissions[i].equals(storagePermission)
                                              || permissions[i].equals(
                                                      Manifest.permission.READ_MEDIA_IMAGES)
-@@ -685,6 +692,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -701,6 +708,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
              }
              if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
          }
@@ -1743,7 +1719,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
          return mimeTypes;
      }
  
-@@ -1034,6 +1042,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1062,6 +1070,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          return countAcceptTypesFor(superType) == mFileTypes.size();
      }
  
@@ -1770,7 +1746,7 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st
 diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
 --- a/ui/shell_dialogs/select_file_dialog.h
 +++ b/ui/shell_dialogs/select_file_dialog.h
-@@ -199,6 +199,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
+@@ -224,6 +224,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
                    const GURL* caller = nullptr);
    bool HasMultipleFileTypeChoices();
  
@@ -1782,8 +1758,8 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil
 diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
 --- a/ui/shell_dialogs/select_file_dialog_android.cc
 +++ b/ui/shell_dialogs/select_file_dialog_android.cc
-@@ -137,6 +137,12 @@ void SelectFileDialogImpl::SelectFileImpl(
-                                    owning_window->GetJavaObject());
+@@ -160,6 +160,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+       accept_multiple_files, owning_window->GetJavaObject());
  }
  
 +void SelectFileDialogImpl::ShowToast(const std::string& message) {
@@ -1798,8 +1774,8 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/s
 diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
 --- a/ui/shell_dialogs/select_file_dialog_android.h
 +++ b/ui/shell_dialogs/select_file_dialog_android.h
-@@ -58,6 +58,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
-                       void* params,
+@@ -53,6 +53,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
+                       gfx::NativeWindow owning_window,
                        const GURL* caller) override;
  
 +  void ShowToast(const std::string& message) override;
@@ -1836,7 +1812,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_linux.h b/ui/shell_dialogs/sele
 diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
 --- a/ui/shell_dialogs/select_file_dialog_win.cc
 +++ b/ui/shell_dialogs/select_file_dialog_win.cc
-@@ -194,6 +194,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
+@@ -193,6 +193,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
                              int index);
  
    bool HasMultipleFileTypeChoicesImpl() override;
@@ -1844,7 +1820,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec
  
    // Returns the filter to be used while displaying the open/save file dialog.
    // This is computed from the extensions for the file types being opened.
-@@ -272,6 +273,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
+@@ -270,6 +271,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
    return has_multiple_file_type_choices_;
  }
  

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

@@ -26,10 +26,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -43,6 +43,16 @@ found in the LICENSE file.
-         android:key="do_not_track"
-         android:title="@string/do_not_track_title"
-         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
+@@ -63,6 +63,16 @@ 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"
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -55,6 +55,9 @@ import java.lang.annotation.Retention;
+@@ -58,6 +58,9 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
 @@ -244,6 +247,9 @@ public class LaunchIntentDispatcher {
-      */
+     @OptIn(markerClass = ExperimentalAuthTab.class)
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
 +        if (!ContextUtils.getAppSharedPreferences()
@@ -66,9 +66,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          Log.w(
                  TAG,
                  "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -265,6 +271,10 @@ public class LaunchIntentDispatcher {
-         newIntent.setData(uri);
-         newIntent.setClassName(context, CustomTabActivity.class.getName());
+@@ -272,6 +278,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 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          // Since configureIntentForResizableCustomTab() might change the componenet/class
          // associated with the passed intent, it needs to be called after #setClassName(context,
          // CustomTabActivity.class.getName());
-@@ -410,6 +420,17 @@ public class LaunchIntentDispatcher {
+@@ -445,6 +455,17 @@ public class LaunchIntentDispatcher {
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -98,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -850,6 +850,7 @@ public class CustomTabsConnection {
+@@ -920,6 +920,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
-@@ -38,6 +38,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -39,6 +39,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -119,7 +119,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
+@@ -116,6 +119,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
      }
  
      private static boolean isIntentFromThirdPartyAllowed() {
@@ -132,17 +132,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -96,6 +96,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+@@ -99,6 +99,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+ 
      private IncognitoLockSettings mIncognitoLockSettings;
  
 +    private ChromeSwitchPreference allowCustomTabIntentsPref;
 +    private ChromeSwitchPreference openExternalLinksPref;
 +
      @Override
-     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
          getActivity().setTitle(R.string.prefs_privacy_security);
-@@ -274,6 +277,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -312,6 +315,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
      }
  
@@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
-@@ -290,6 +296,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -328,6 +334,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
          } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -312,6 +326,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -350,6 +364,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                      UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
@@ -203,7 +203,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5152,6 +5152,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -5696,6 +5696,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <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>

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

@@ -10,14 +10,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../org/chromium/chrome/browser/ApplicationLifetime.java    | 2 ++
  .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
  .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
- .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
  .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 6 files changed, 26 insertions(+), 1 deletion(-)
+ 5 files changed, 21 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
-@@ -166,6 +166,9 @@ found in the LICENSE file.
+@@ -163,6 +163,9 @@ found in the LICENSE file.
          <item android:id="@+id/managed_by_menu_id"
              android:title="@string/managed_browser"
              android:icon="@drawable/ic_business" />
@@ -59,8 +58,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -267,6 +267,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
- import java.util.function.BooleanSupplier;
+@@ -263,6 +263,8 @@ import java.util.Set;
+ import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.function.DoubleConsumer;
  
 +import org.chromium.chrome.browser.ApplicationLifetime;
@@ -68,15 +67,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  /**
   * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
   * accessible via a chrome specific tab switching UI.
-@@ -2925,6 +2927,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2699,6 +2701,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          } else if (id == R.id.close_tab) {
-             getCurrentTabModel().closeTab(currentTab, true, false, true);
+             getCurrentTabModel().closeTabs(TabClosureParams.closeTab(currentTab).build());
              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(
+             Runnable closeAllTabsRunnable =
 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
@@ -88,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2576,6 +2577,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2563,6 +2564,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -100,26 +99,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          if (id == R.id.update_menu_id) {
              UpdateMenuItemHelper.getInstance(
                              getProfileProviderSupplier().get().getOriginalProfile())
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
-@@ -81,7 +81,11 @@ class ChromeLifetimeController
- 
-         // Kick off a timer to kill the process after a delay, which fires only if the Activities
-         // take too long to be finished.
--        mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
-+        if (restart) {
-+            mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
-+        } else {
-+            fireBrowserRestartActivityIntent();
-+        }
-     }
- 
-     @Override
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3745,6 +3745,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -4245,6 +4245,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
          Dark theme
        </message>

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

@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/functional/bind.h"
-@@ -392,6 +393,15 @@ AutocompleteController::AutocompleteController(
+@@ -541,6 +542,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);
  
@@ -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"
-@@ -644,6 +645,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -79,8 +79,8 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -7,6 +7,8 @@
- #include <stddef.h>
+@@ -14,6 +14,8 @@
+ #include <string_view>
  
  #include "base/check_op.h"
 +#include "base/containers/contains.h"
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/i18n/char_iterator.h"
-@@ -621,6 +623,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -625,6 +627,8 @@ GURL FixupURLInternal(const std::string& text,
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
      if (chrome_url && !parts.host.is_valid())

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

@@ -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",
@@ -92,7 +92,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -22,6 +22,10 @@
+@@ -26,6 +26,10 @@
  #include "net/socket/client_socket_handle.h"
  #include "net/socket/client_socket_pool.h"
  #include "net/socket/connect_job.h"
@@ -103,7 +103,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  #include "net/ssl/ssl_config.h"
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
-@@ -168,6 +172,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -172,6 +176,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
  int ClientSocketPoolManager::max_sockets_per_group(
      HttpNetworkSession::SocketPoolType pool_type) {
    DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);

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

@@ -45,7 +45,7 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1030,6 +1030,7 @@ component("net") {
+@@ -1081,6 +1081,7 @@ component("net") {
      "//build:chromeos_buildflags",
      "//components/miracle_parameter/common",
      "//net/http:transport_security_state_generated_files",
@@ -56,7 +56,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -113,6 +113,7 @@
+@@ -114,6 +114,7 @@
  #include "net/log/net_log_event_type.h"
  #include "net/log/net_log_source.h"
  #include "net/log/net_log_source_type.h"
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
  #include "net/log/net_log_with_source.h"
  #include "net/socket/client_socket_factory.h"
  #include "net/url_request/url_request_context.h"
-@@ -1373,6 +1374,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1430,6 +1431,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -7,10 +7,107 @@ when flag is disabled no external intent will ever be allowed, for any URL.
 
 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 +++-
+ .../ExternalNavigationDelegateImpl.java       |  3 +-
+ .../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++
+ ...g-to-disable-external-intent-requests.grdp |  9 +++++
+ ...ag-to-disable-external-intent-requests.inc | 13 ++++++++
+ ...ag-to-disable-external-intent-requests.inc |  3 ++
+ 6 files changed, 66 insertions(+), 2 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/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
+@@ -83,7 +83,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/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
+@@ -19,6 +19,7 @@ import org.chromium.base.IntentUtils;
+ import org.chromium.base.PackageManagerUtils;
+ import org.chromium.base.supplier.Supplier;
+ 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.tab.EmptyTabObserver;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -103,7 +104,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+ 
+     @Override
+     public boolean shouldDisableExternalIntentRequestsForUrl(GURL url) {
+-        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.base.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 for redirecting to an external intent.
++    </message>
++</grit-part>
 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 +126,12 @@ new file mode 100644
 +#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);
 --

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

@@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -635,6 +635,10 @@
+@@ -757,6 +757,10 @@
        status: {"Android": "stable"},
        base_feature: "none",
      },

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

@@ -7,31 +7,33 @@ 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 | 11 ++++++++++-
  build_overrides/build.gni      |  3 +++
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
 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
-@@ -1889,13 +1889,21 @@ config("default_warnings") {
-         # TODO(https://crbug.com/1490607): Fix and re-enable.
+@@ -1962,7 +1962,6 @@ config("default_warnings") {
+         # TODO(crbug.com/40284799): Fix and re-enable.
          "-Wno-thread-safety-reference-return",
        ]
 -
-       if (!is_nacl) {
-         cflags_cc += [
-           # TODO(https://crbug.com/1513724): Fix and re-enable.
-           "-Wno-c++11-narrowing-const-reference",
-         ]
+       cflags_cc += [
+         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
+         "-Wenum-compare-conditional",
+@@ -1980,6 +1979,16 @@ config("default_warnings") {
+         # TODO(crbug.com/356172342): Fix and re-enable.
+         cflags_cc += [ "-Wno-dangling-assignment-gsl" ]
        }
 +      if (skip_clangd_unsupported_options) {
 +        cflags -= [
-+          "-Wno-deprecated-builtins",
 +          "-Wno-thread-safety-reference-return",
 +        ]
 +        cflags_cc -= [
 +          "-Wno-c++11-narrowing-const-reference",
++          "-Wno-missing-template-arg-list-after-template-kw",
++          "-Wno-dangling-assignment-gsl",
 +        ]
 +      }
      }
@@ -40,7 +42,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -62,6 +62,9 @@ declare_args() {
+@@ -54,6 +54,9 @@ declare_args() {
    # to lack of toolchain support.
    gtest_enable_absl_printers = !is_nacl
  
@@ -48,6 +50,6 @@ diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 +  skip_clangd_unsupported_options = false
 +
    # Allow projects that wish to stay on C++17 to override Chromium's default.
-   # TODO(crbug.com/1402249): evaluate removing this end of 2023
+   # TODO(crbug.com/40251117): evaluate removing this end of 2023
    use_cxx17 = false
 --

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

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

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

@@ -7,7 +7,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/java/res/menu/main_menu.xml    |  7 ++
  .../chrome/browser/ChromeTabbedActivity.java  | 24 +++++++
  .../browser/bookmarks/BookmarkBridge.java     | 67 +++++++++++++++++++
- .../bookmarks/android/bookmark_bridge.cc      | 44 ++++++++++++
+ .../bookmarks/android/bookmark_bridge.cc      | 44 +++++++++++-
  .../bookmarks/android/bookmark_bridge.h       |  8 +++
  .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
  .../dialogs/DownloadLocationCustomView.java   |  4 +-
@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/bookmark_bar_strings.grdp          |  6 ++
  .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
  components/bookmarks/browser/bookmark_codec.h |  7 +-
- .../browser/bookmark_load_details.cc          |  8 ++-
+ .../browser/bookmark_load_details.cc          | 14 +++-
  .../bookmarks/browser/bookmark_load_details.h |  2 +
  .../bookmarks/browser/bookmark_model.cc       |  3 +-
  components/bookmarks/browser/bookmark_model.h |  7 ++
@@ -26,12 +26,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/bookmarks/browser/bookmark_uuids.h |  1 +
  components/bookmarks/browser/model_loader.cc  |  8 ++-
  .../bookmark_specifics_conversions.cc         |  1 +
- 22 files changed, 236 insertions(+), 14 deletions(-)
+ 22 files changed, 241 insertions(+), 15 deletions(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -71,6 +71,10 @@ found in the LICENSE file.
+@@ -74,6 +74,10 @@ found in the LICENSE file.
          <item android:id="@+id/all_bookmarks_menu_id"
              android:title="@string/menu_bookmarks"
              android:icon="@drawable/btn_star_filled" />
@@ -43,19 +43,19 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
              android:title="@string/menu_recent_tabs"
              android:icon="@drawable/devices_black_24dp" />
 @@ -186,6 +190,9 @@ found in the LICENSE file.
-         <item android:id="@+id/close_all_incognito_tabs_menu_id"
-             android:title="@string/menu_close_all_incognito_tabs"
-             android:icon="@drawable/btn_close_white" />
+         <item android:id="@id/tinker_tank_menu_id"
+             android:title="@string/menu_tinker_tank"
+             android:icon="@drawable/ic_add_box_rounded_corner" />
 +        <item android:id="@+id/bookmark_all_tabs_menu_id"
 +            android:title="@string/menu_bookmark_all_tabs"
 +            android:icon="@drawable/ic_folder_blue_24dp" />
          <item android:id="@+id/menu_select_tabs"
              android:title="@string/menu_select_tabs"
-             android:icon="@drawable/ic_select_tabs" />
+             android:icon="@drawable/ic_select_check_box_24dp" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -89,6 +89,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
+@@ -92,6 +92,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -63,16 +63,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -2950,6 +2951,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2731,6 +2732,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                      getTabModelSelectorSupplier().get(),
-                     () -> getTabModelSelector().closeAllTabs());
+                     closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
 +        } else if (id == R.id.bookmark_all_tabs_menu_id) {
 +            bookmarkAllTabs();
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              // Close only incognito tabs
-             CloseAllTabsDialog.show(
-@@ -3021,6 +3024,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+             Runnable closeAllTabsRunnable =
+@@ -2817,6 +2820,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -103,9 +103,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -18,11 +18,17 @@ import org.jni_zero.NativeMethods;
+@@ -18,11 +18,17 @@ import org.jni_zero.JniType;
+ import org.jni_zero.NativeMethods;
  
- import org.chromium.base.Callback;
  import org.chromium.base.ContextUtils;
 +import org.chromium.base.Log;
  import org.chromium.base.ObserverList;
@@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private long mNativeBookmarkBridge;
      private boolean mIsDestroyed;
      private boolean mIsDoingExtensiveChanges;
-@@ -402,6 +410,16 @@ class BookmarkBridge {
+@@ -395,6 +403,16 @@ class BookmarkBridge {
          return mMobileFolderId;
      }
  
@@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /** Returns Id representing the special "other" folder from bookmark model. */
      public BookmarkId getOtherFolderId() {
          ThreadUtils.assertOnUiThread();
-@@ -1092,6 +1110,50 @@ class BookmarkBridge {
+@@ -1083,6 +1101,50 @@ class BookmarkBridge {
                  .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
      }
  
@@ -198,9 +198,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Helper method to mark an item as read.
       *
-@@ -1334,6 +1396,9 @@ class BookmarkBridge {
- 
-         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(long nativeBookmarkBridge, GURL url);
+@@ -1331,6 +1393,9 @@ class BookmarkBridge {
+         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
+                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
  
 +        BookmarkId getBookmarkIdForTabsCollection(
 +                long nativeBookmarkBridge, GURL url);
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
  
          void getTopLevelFolderIds(
-@@ -1353,6 +1418,8 @@ class BookmarkBridge {
+@@ -1352,6 +1417,8 @@ class BookmarkBridge {
  
          BookmarkId getRootFolderId(long nativeBookmarkBridge);
  
@@ -220,8 +220,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -367,6 +367,33 @@ void BookmarkBridge::GetImageUrlForBookmark(
-       base::BindOnce(&HandleImageUrlResponse, callback));
+@@ -184,7 +184,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
+ 
+     JNIEnv* env = AttachCurrentThread();
+     Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
+-                                          ConvertUTF8ToJavaString(env, export_path_),
++                                          base::android::ConvertUTF8ToJavaString(env, export_path_),
+                                           result == Result::kSuccess);
+     delete this;
+   }
+@@ -355,6 +355,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
+   return bookmark_model_->account_mobile_node() != nullptr;
  }
  
 +base::android::ScopedJavaLocalRef<jobject>
@@ -230,7 +239,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    const JavaParamRef<jobject>& url) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  GURL gurl = *url::GURLAndroid::ToNativeGURL(env, url);
++  GURL gurl = url::GURLAndroid::ToNativeGURL(env, url);
 +
 +  bookmarks::BookmarkModel* model =
 +      BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -252,9 +261,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +}
 +
  base::android::ScopedJavaLocalRef<jobject>
- BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(
-     JNIEnv* env,
-@@ -482,6 +509,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+ BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
+                                                          const GURL& url) {
+@@ -467,6 +494,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
    // Vector to temporarily contain all child bookmarks at same level for sorting
    std::vector<const BookmarkNode*> bookmarks = {
        bookmark_model_->mobile_node(),
@@ -262,19 +271,17 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -539,6 +567,11 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
-     top_level_folders.push_back(root_child.get());
+@@ -560,6 +588,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+     top_level_folders.push_back(other_node);
    }
  
-+  for (const auto& node : bookmark_model_->tabs_collection_node()->children()) {
-+    if (node->is_folder())
-+      top_level_folders.push_back(node.get());
-+  }
++  const BookmarkNode* tabs_collection_node = bookmark_model_->tabs_collection_node();
++  top_level_folders.push_back(tabs_collection_node);
 +
-   if (account_reading_list_manager_ &&
-       account_reading_list_manager_->GetRoot()) {
-     top_level_folders.push_back(account_reading_list_manager_->GetRoot());
-@@ -1176,6 +1209,17 @@ void BookmarkBridge::GetBookmarksOfType(
+   const BookmarkNode* reading_list_node =
+       local_or_syncable_reading_list_manager_->GetRoot();
+   if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
+@@ -1266,6 +1297,17 @@ void BookmarkBridge::GetBookmarksOfType(
    AddBookmarkNodesToBookmarkIdList(env, j_list, results);
  }
  
@@ -295,18 +302,18 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.h
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
-@@ -77,6 +77,10 @@ class BookmarkBridge : public ProfileObserver,
-       const base::android::JavaParamRef<jobject>& j_url,
-       const base::android::JavaParamRef<jobject>& j_callback);
+@@ -79,6 +79,10 @@ class BookmarkBridge : public ProfileObserver,
+ 
+   jboolean AreAccountBookmarkFoldersActive(JNIEnv* env);
  
 +  base::android::ScopedJavaLocalRef<jobject> GetBookmarkIdForTabsCollection(
 +      JNIEnv* env,
 +      const base::android::JavaParamRef<jobject>& url);
 +
    base::android::ScopedJavaLocalRef<jobject>
-   GetMostRecentlyAddedUserBookmarkIdForUrl(
-       JNIEnv* env,
-@@ -227,6 +231,10 @@ class BookmarkBridge : public ProfileObserver,
+   GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url);
+   const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl(
+@@ -222,6 +226,10 @@ class BookmarkBridge : public ProfileObserver,
                            const base::android::JavaParamRef<jobject>& j_list,
                            jint type);
  
@@ -384,7 +391,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3875,6 +3875,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -4372,6 +4372,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
          Select tabs
        </message>
@@ -420,7 +427,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
 diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
 --- a/components/bookmarks/browser/bookmark_codec.cc
 +++ b/components/bookmarks/browser/bookmark_codec.cc
-@@ -35,6 +35,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
+@@ -36,6 +36,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
  const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
  // The value is left as 'synced' for historical reasons.
  const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
@@ -428,7 +435,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  const char BookmarkCodec::kVersionKey[] = "version";
  const char BookmarkCodec::kChecksumKey[] = "checksum";
  const char BookmarkCodec::kIdKey[] = "id";
-@@ -72,6 +73,7 @@ base::Value::Dict BookmarkCodec::Encode(
+@@ -73,6 +74,7 @@ base::Value::Dict BookmarkCodec::Encode(
      const BookmarkNode* bookmark_bar_node,
      const BookmarkNode* other_folder_node,
      const BookmarkNode* mobile_folder_node,
@@ -436,16 +443,16 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
      std::string sync_metadata_str) {
    ids_reassigned_ = false;
    uuids_reassigned_ = false;
-@@ -91,6 +93,8 @@ base::Value::Dict BookmarkCodec::Encode(
-   roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
-   roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
-   roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
-+  if (tabs_folder_node)
-+    roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
- 
-   FinalizeChecksum();
-   // We are going to store the computed checksum. So set stored checksum to be
-@@ -107,6 +111,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -98,6 +100,8 @@ base::Value::Dict BookmarkCodec::Encode(
+     roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
+     roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
+     roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
++    if (tabs_folder_node)
++      roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
+   } else {
+     // No permanent node should have been provided.
+     CHECK(!other_folder_node);
+@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
@@ -453,7 +460,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                             int64_t* max_id,
                             std::string* sync_metadata_str) {
    const int64_t max_already_assigned_id =
-@@ -117,7 +122,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -133,7 +138,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
              base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
              base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
              base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -463,7 +470,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    ids_reassigned_ = false;
    uuids_reassigned_ = false;
    ids_valid_ = true;
-@@ -125,13 +131,14 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -141,13 +147,14 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
    stored_checksum_.clear();
    InitializeChecksum();
    bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
@@ -479,7 +486,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    }
    *max_id = maximum_id_ + 1;
    return success;
-@@ -189,6 +196,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
+@@ -205,6 +212,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
  bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                   BookmarkNode* other_folder_node,
                                   BookmarkNode* mobile_folder_node,
@@ -487,7 +494,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                                   const base::Value::Dict& value,
                                   std::string* sync_metadata_str) {
    std::optional<int> version = value.FindInt(kVersionKey);
-@@ -213,6 +221,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -237,6 +245,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
        roots->FindDict(kOtherBookmarkFolderNameKey);
    const base::Value::Dict* mobile_folder_value =
        roots->FindDict(kMobileBookmarkFolderNameKey);
@@ -496,16 +503,16 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  
    if (!bb_value || !other_folder_value || !mobile_folder_value)
      return false;
-@@ -220,6 +230,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -244,6 +254,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
    DecodeNode(*bb_value, nullptr, bb_node);
    DecodeNode(*other_folder_value, nullptr, other_folder_node);
    DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
 +  if (tabs_folder_value)
 +    DecodeNode(*tabs_folder_value, nullptr, tabs_folder_node);
  
-   if (sync_metadata_str) {
-     const std::string* sync_metadata_str_base64 =
-@@ -459,11 +471,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+   // Need to reset the title as the title is persisted and restored from
+   // the file.
+@@ -477,12 +489,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,
@@ -513,6 +520,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 +                                BookmarkNode* mobile_node,
 +                                BookmarkNode* tabs_folder_node) {
    ids_.clear();
+   reassigned_ids_per_old_id_.clear();
    ReassignIDsHelper(bb_node);
    ReassignIDsHelper(other_node);
    ReassignIDsHelper(mobile_node);
@@ -523,7 +531,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
 --- a/components/bookmarks/browser/bookmark_codec.h
 +++ b/components/bookmarks/browser/bookmark_codec.h
-@@ -39,6 +39,7 @@ class BookmarkCodec {
+@@ -43,6 +43,7 @@ class BookmarkCodec {
        const BookmarkNode* bookmark_bar_node,
        const BookmarkNode* other_folder_node,
        const BookmarkNode* mobile_folder_node,
@@ -531,7 +539,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
        std::string sync_metadata_str);
  
    // Decodes the previously encoded value to the specified nodes as well as
-@@ -57,6 +58,7 @@ class BookmarkCodec {
+@@ -61,6 +62,7 @@ class BookmarkCodec {
                BookmarkNode* bb_node,
                BookmarkNode* other_folder_node,
                BookmarkNode* mobile_folder_node,
@@ -539,7 +547,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -82,6 +84,7 @@ class BookmarkCodec {
+@@ -92,6 +94,7 @@ class BookmarkCodec {
    static const char kBookmarkBarFolderNameKey[];
    static const char kOtherBookmarkFolderNameKey[];
    static const char kMobileBookmarkFolderNameKey[];
@@ -547,7 +555,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
    static const char kVersionKey[];
    static const char kChecksumKey[];
    static const char kIdKey[];
-@@ -114,6 +117,7 @@ class BookmarkCodec {
+@@ -124,6 +127,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -555,7 +563,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value::Dict& value,
                      std::string* sync_metadata_str);
  
-@@ -124,7 +128,8 @@ class BookmarkCodec {
+@@ -134,7 +138,8 @@ class BookmarkCodec {
    // Reassigns bookmark IDs for all nodes.
    void ReassignIDs(BookmarkNode* bb_node,
                     BookmarkNode* other_node,
@@ -586,7 +594,26 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
  
    CHECK_EQ(kNumDefaultTopLevelPermanentFolders, root_node_->children().size());
  }
-@@ -105,8 +107,8 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -86,6 +88,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
+   if (mobile_folder_node_->id() == 0) {
+     mobile_folder_node_->set_id(max_id_++);
+   }
++
++  if (tabs_collection_folder_node_->id() == 0) {
++    tabs_collection_folder_node_->set_id(max_id_++);
++  }
+ }
+ 
+ void BookmarkLoadDetails::AddManagedNode(
+@@ -98,6 +104,7 @@ void BookmarkLoadDetails::AddManagedNode(
+   CHECK_NE(bb_node_->id(), 0);
+   CHECK_NE(other_folder_node_->id(), 0);
+   CHECK_NE(mobile_folder_node_->id(), 0);
++  CHECK_NE(tabs_collection_folder_node_->id(), 0);
+ 
+   has_managed_node_ = true;
+   root_node_->Add(std::move(managed_node));
+@@ -105,8 +112,8 @@ void BookmarkLoadDetails::AddManagedNode(
  
  void BookmarkLoadDetails::CreateIndices() {
    local_or_syncable_uuid_index_.insert(root_node_.get());
@@ -597,10 +624,18 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
    for (const auto& child : root_node_->children()) {
      if (child.get() == account_bb_node_ ||
          child.get() == account_other_folder_node_ ||
+@@ -125,6 +132,7 @@ void BookmarkLoadDetails::ResetPermanentNodePointers() {
+   bb_node_ = nullptr;
+   other_folder_node_ = nullptr;
+   mobile_folder_node_ = nullptr;
++  tabs_collection_folder_node_ = nullptr;
+   account_bb_node_ = nullptr;
+   account_other_folder_node_ = nullptr;
+   account_mobile_folder_node_ = nullptr;
 diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h
 --- a/components/bookmarks/browser/bookmark_load_details.h
 +++ b/components/bookmarks/browser/bookmark_load_details.h
-@@ -39,6 +39,7 @@ class BookmarkLoadDetails {
+@@ -40,6 +40,7 @@ class BookmarkLoadDetails {
    BookmarkPermanentNode* bb_node() { return bb_node_; }
    BookmarkPermanentNode* mobile_folder_node() { return mobile_folder_node_; }
    BookmarkPermanentNode* other_folder_node() { return other_folder_node_; }
@@ -608,7 +643,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
  
    // Account permanent nodes (null unless `AddAccountPermanentNodes()` is
    // called).
-@@ -138,6 +139,7 @@ class BookmarkLoadDetails {
+@@ -151,6 +152,7 @@ class BookmarkLoadDetails {
    raw_ptr<BookmarkPermanentNode> bb_node_;
    raw_ptr<BookmarkPermanentNode> other_folder_node_;
    raw_ptr<BookmarkPermanentNode> mobile_folder_node_;
@@ -619,7 +654,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
 --- a/components/bookmarks/browser/bookmark_model.cc
 +++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -846,7 +846,7 @@ bool BookmarkModel::HasBookmarks() const {
+@@ -802,7 +802,7 @@ bool BookmarkModel::HasBookmarks() const {
  bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    return bookmark_bar_node_->children().empty() &&
@@ -628,7 +663,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1191,6 +1191,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1110,6 +1110,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
    bookmark_bar_node_ = details->bb_node();
    other_node_ = details->other_folder_node();
    mobile_node_ = details->mobile_folder_node();
@@ -639,7 +674,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -159,6 +159,12 @@ class BookmarkModel final : public BookmarkUndoProvider,
+@@ -149,6 +149,12 @@ class BookmarkModel : public BookmarkUndoProvider,
    // bookmarks in the account storage).
    const BookmarkNode* account_mobile_node() const;
  
@@ -652,7 +687,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
    bool is_root_node(const BookmarkNode* node) const {
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
      return node == root_;
-@@ -619,6 +625,7 @@ class BookmarkModel final : public BookmarkUndoProvider,
+@@ -566,6 +572,7 @@ class BookmarkModel : public BookmarkUndoProvider,
    raw_ptr<BookmarkPermanentNode> account_bookmark_bar_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> account_other_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> account_mobile_node_ = nullptr;
@@ -670,7 +705,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmark
 +    case bookmarks::BookmarkNode::TABS_COLLECTION:
 +      return !is_desktop;
      case BookmarkNode::URL:
-       NOTREACHED_NORETURN();
+       NOTREACHED();
      case BookmarkNode::FOLDER:
 @@ -211,6 +213,15 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id) {
        l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME)));
@@ -699,7 +734,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
      MOBILE
    };
  
-@@ -231,6 +232,8 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode {
        int64_t id);
    static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
        int64_t id);
@@ -718,8 +753,8 @@ diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookm
 +          model->tabs_collection_node(),
            model->client()->EncodeLocalOrSyncableBookmarkSyncMetadata());
      case BookmarkStorage::kSelectAccountNodes:
-       if (!model->account_bookmark_bar_node()) {
-@@ -59,6 +60,7 @@ base::Value::Dict EncodeModelToDict(
+       // Either all permanent folders or none should exist.
+@@ -61,6 +62,7 @@ base::Value::Dict EncodeModelToDict(
        return codec.Encode(model->account_bookmark_bar_node(),
                            model->account_other_node(),
                            model->account_mobile_node(),
@@ -754,7 +789,7 @@ diff --git a/components/bookmarks/browser/bookmark_uuids.h b/components/bookmark
 diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc
 --- a/components/bookmarks/browser/model_loader.cc
 +++ b/components/bookmarks/browser/model_loader.cc
-@@ -71,6 +71,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -70,6 +70,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
          BookmarkPermanentNode::CreateOtherBookmarks(0);
      std::unique_ptr<BookmarkPermanentNode> account_mobile_folder_node =
          BookmarkPermanentNode::CreateMobileBookmarks(0);
@@ -763,7 +798,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
  
      std::optional<base::Value::Dict> root_dict =
          LoadFileToDict(account_file_path);
-@@ -78,7 +80,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -77,7 +79,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
      if (root_dict.has_value() &&
          codec.Decode(*root_dict, /*already_assigned_ids=*/{},
                       account_bb_node.get(), account_other_folder_node.get(),
@@ -773,7 +808,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
                       &sync_metadata_str)) {
        ids_assigned_to_account_nodes = codec.release_assigned_ids();
  
-@@ -110,7 +113,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -119,7 +122,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
      if (root_dict.has_value() &&
          codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
                       details->bb_node(), details->other_folder_node(),
@@ -786,7 +821,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
 --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
 +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
-@@ -445,6 +445,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+@@ -444,6 +444,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
      case bookmarks::BookmarkNode::BOOKMARK_BAR:
      case bookmarks::BookmarkNode::OTHER_NODE:
      case bookmarks::BookmarkNode::MOBILE:

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

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/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.
+@@ -58,6 +58,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:orderInCategory="2" />
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -113,6 +113,9 @@ found in the LICENSE file.
+@@ -110,6 +110,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2976,6 +2976,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2764,6 +2764,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2729,6 +2729,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2720,6 +2720,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return doOpenWebApk(currentTab);
          }
  
@@ -69,16 +69,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -585,6 +585,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-                         isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
+@@ -566,6 +566,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
  
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
 +        updateViewSourceMenuItem(menu, currentTab);
  
-         updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
+         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
  
-@@ -1236,6 +1237,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         }
+@@ -1298,6 +1299,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         findInPageMenuRow.setVisible(itemVisible);
      }
  
 +    /**
@@ -104,10 +104,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -295,6 +295,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -299,6 +299,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  
              updateRequestDesktopSiteMenuItem(
-                     menu, currentTab, requestDesktopSiteVisible, isChromeScheme);
+                     menu, currentTab, requestDesktopSiteVisible, isNativePage);
 +            updateViewSourceMenuItem(menu, currentTab);
              prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
          }
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -317,6 +317,10 @@ CHAR_LIMIT guidelines:
+@@ -312,6 +312,10 @@ CHAR_LIMIT guidelines:
          USB
        </message>
  

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

@@ -4,24 +4,21 @@ 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 +-
- .../layouts/content/TabContentManager.java    |  7 +++-
- .../privacy/settings/PrivacySettings.java     | 42 ++++++++++++++++++-
+ .../privacy/settings/PrivacySettings.java     | 43 ++++++++++++++++++-
  .../strings/android_chrome_strings.grd        |  8 ++++
- 7 files changed, 73 insertions(+), 7 deletions(-)
+ 6 files changed, 69 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
-@@ -327,9 +327,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.
+@@ -336,7 +336,12 @@ class TabGridViewBinder {
+                     if (result != null) {
+                         TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
+                     } else {
 -                        thumbnail.setImageDrawable(null);
 +                        TabListFaviconProvider.TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
 +                        if (tabFavicon != null) {
@@ -32,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -368,6 +371,7 @@ class TabGridViewBinder {
+@@ -375,6 +380,7 @@ class TabGridViewBinder {
              ViewLookupCachingFrameLayout rootView,
              PropertyModel model,
              TabListFaviconProvider.TabFavicon favicon) {
@@ -43,7 +40,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
-@@ -63,6 +63,9 @@ public class TabProperties {
+@@ -82,6 +82,9 @@ public class TabProperties {
      public static final WritableBooleanPropertyKey FAVICON_FETCHED =
              new WritableBooleanPropertyKey();
  
@@ -53,16 +50,16 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /** Property for lazily fetching favicons when required by an item in a UI. */
      public static final WritableObjectPropertyKey<TabListFaviconProvider.TabFaviconFetcher>
              FAVICON_FETCHER = new WritableObjectPropertyKey<>();
-@@ -160,6 +163,7 @@ public class TabProperties {
+@@ -180,6 +183,7 @@ public class TabProperties {
                  CARD_TYPE,
                  CONTENT_DESCRIPTION_STRING,
-                 CLOSE_BUTTON_DESCRIPTION_STRING,
+                 ACTION_BUTTON_DESCRIPTION_STRING,
 +                FAVICON,
                  SHOPPING_PERSISTED_TAB_DATA_FETCHER,
                  SHOULD_SHOW_PRICE_DROP_TOOLTIP,
-                 QUICK_DELETE_ANIMATION_STATUS
-@@ -172,6 +176,7 @@ public class TabProperties {
-                 TAB_CLOSED_LISTENER,
+                 QUICK_DELETE_ANIMATION_STATUS,
+@@ -196,6 +200,7 @@ public class TabProperties {
+                 TAB_ACTION_BUTTON_LISTENER,
                  FAVICON_FETCHED,
                  FAVICON_FETCHER,
 +                FAVICON,
@@ -72,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -54,6 +54,11 @@ found in the LICENSE file.
+@@ -74,6 +74,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,47 +84,27 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -145,6 +145,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+@@ -144,6 +144,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.printing.TabPrinter;
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
  import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.readaloud.ReadAloudController;
- import org.chromium.chrome.browser.selection.SelectionPopupBackPressHandler;
-@@ -704,7 +705,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ import org.chromium.chrome.browser.profiles.ProfileManager;
+ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -724,7 +725,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      new TabContentManager(
                              this,
                              mBrowserControlsManagerSupplier.get(),
 -                            !SysUtils.isLowEndDevice(),
 +                            !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
-                             tabModelSelector != null ? tabModelSelector::getTabById : null));
+                             tabModelSelector != null ? tabModelSelector::getTabById : null,
+                             TabWindowManagerSingleton.getInstance()));
  
-             getBrowserControlsManager()
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
-@@ -326,11 +326,14 @@ public class TabContentManager {
-      */
-     public void getTabThumbnailWithCallback(
-             @NonNull int tabId,
--            @NonNull Size thumbnailSize,
-+            @NonNull Size thumbnailSize, //
-             @NonNull Callback<Bitmap> callback,
-             boolean forceUpdate,
-             boolean writeBack) {
--        if (!mSnapshotsEnabled) return;
-+        if (!mSnapshotsEnabled) {
-+            callback.onResult(null);
-+            return;
-+        }
- 
-         // TODO(crbug/1444782): Remove forceUpdate and writeBack params once the following features
-         // launch:
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -66,12 +66,25 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -63,12 +63,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  
@@ -143,6 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  public class PrivacySettings extends ChromeBaseSettingsFragment
 -        implements Preference.OnPreferenceChangeListener {
 +        implements Preference.OnPreferenceChangeListener, INeedSnackbarManager {
++
 +    private SnackbarManager mSnackbarManager;
 +    private Snackbar mSnackbar;
 +
@@ -154,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_PRELOAD_PAGES = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -140,6 +153,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -153,6 +167,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -176,7 +154,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(
-@@ -321,6 +349,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -359,6 +388,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";
@@ -184,7 +162,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -346,6 +375,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -384,6 +414,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -198,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -386,6 +422,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -440,6 +477,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              : R.string.text_off);
          }
  
@@ -212,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5371,6 +5371,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -5906,6 +5906,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
          Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
        </message>
  

build/patches/Add-option-to-force-tablet-UI.patch

@@ -1,30 +1,169 @@
-From: Wengling Chen <feiyu2817@gmail.com>
-Date: Mon, 1 Feb 2021 19:18:55 +0200
+From: uazo <uazo@users.noreply.github.com>
+Date: Sun, 5 May 2024 09:34:39 +0000
 Subject: Add option to force tablet UI
 
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++++++
- .../browser/tasks/ReturnToChromeUtil.java     |  4 +++-
- .../chrome/browser/ui/RootUiCoordinator.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/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 +++++-
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +++-
+ .../chrome/browser/ui/RootUiCoordinator.java  |  5 +++-
  chrome/browser/preferences/BUILD.gn           |  1 +
  .../preferences/ChromePreferenceKeys.java     |  1 +
- .../preferences/ChromeSharedPreferences.java  |  8 ++++++++
+ .../preferences/ChromeSharedPreferences.java  |  8 +++++++
  .../LegacyChromePreferenceKeys.java           |  1 +
+ .../SingleTabSwitcherOnNtpMediator.java       |  1 +
  .../omnibox/LocationBarCoordinator.java       |  2 +-
- .../strings/android_chrome_strings.grd        |  7 +++++++
- components/BUILD.gn                           |  6 +++---
- .../res/xml/accessibility_preferences.xml     |  5 +++++
- .../accessibility/AccessibilitySettings.java  | 10 ++++++++++
- .../AccessibilitySettingsDelegate.java        |  2 ++
- .../chromium/ui/base/DeviceFormFactor.java    |  6 ++++++
- 14 files changed, 71 insertions(+), 6 deletions(-)
+ .../strings/android_chrome_strings.grd        |  7 ++++++
+ .../java/res/layout/control_container.xml     | 10 ++++----
+ .../java/res/layout/toolbar_tablet.xml        |  2 +-
+ .../java/res/values-sw600dp/dimens.xml        |  5 ++--
+ .../toolbar/java/res/values/dimens.xml        |  5 ++--
+ .../browser/toolbar/ControlContainer.java     |  2 +-
+ .../toolbar/top/ToolbarControlContainer.java  | 24 ++++++++++++++++++-
+ .../browser/toolbar/top/ToolbarLayout.java    |  5 +++-
+ .../TabStripTransitionCoordinator.java        |  2 +-
+ components/BUILD.gn                           |  6 ++---
+ .../res/xml/accessibility_preferences.xml     |  5 ++++
+ .../AccessibilitySettingsDelegate.java        | 11 +++++++++
+ .../chromium/ui/base/DeviceFormFactor.java    |  9 +++++++
+ 31 files changed, 158 insertions(+), 30 deletions(-)
 
+diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
+--- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
++++ b/chrome/android/java/res/layout/custom_tabs_control_container.xml
+@@ -32,7 +32,7 @@ found in the LICENSE file.
+             android:id="@+id/find_toolbar_stub"
+             android:inflatedId="@+id/find_toolbar"
+             android:visibility="gone"
+-            android:layout_marginTop="@dimen/tab_strip_height"
++            android:layout_marginTop="@dimen/tab_strip_height_cromite"
+             android:layout_width="match_parent"
+             android:layout_height="@dimen/custom_tabs_control_container_height"
+             android:layout="@layout/find_toolbar" />
+diff --git a/chrome/android/java/res/layout/recent_tabs_page.xml b/chrome/android/java/res/layout/recent_tabs_page.xml
+--- a/chrome/android/java/res/layout/recent_tabs_page.xml
++++ b/chrome/android/java/res/layout/recent_tabs_page.xml
+@@ -11,7 +11,7 @@ found in the LICENSE file.
+     android:id="@+id/history_navigation"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent"
+-    android:paddingTop="@dimen/tab_strip_height" >
++    android:paddingTop="@dimen/tab_strip_height_cromite" >
+ 
+     <org.chromium.chrome.browser.ntp.NativePageRootFrameLayout
+         android:id="@+id/recent_tabs_root"
+diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/java/res/values-sw600dp/dimens.xml
+--- a/chrome/android/java/res/values-sw600dp/dimens.xml
++++ b/chrome/android/java/res/values-sw600dp/dimens.xml
+@@ -14,8 +14,8 @@ found in the LICENSE file.
+     <dimen name="compositor_tab_title_text_size">14sp</dimen>
+ 
+     <!-- Full Screen Dimensions -->
+-    <dimen name="control_container_height">96dp</dimen>
+-    <dimen name="custom_tabs_control_container_height">64dp</dimen>
++    <dimen name="control_container_height_cromite">96dp</dimen>
++    <dimen name="control_container_height_tabletui">96dp</dimen>
+ 
+     <!-- NTP dimensions -->
+     <dimen name="ntp_search_box_transition_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
+@@ -118,9 +118,13 @@ found in the LICENSE file.
+     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
+ 
+     <!-- Should match toolbar_height_no_shadow -->
+-    <dimen name="control_container_height">@dimen/default_action_bar_height</dimen>
++    <dimen name="control_container_height_cromite">@dimen/default_action_bar_height</dimen>
++    <dimen name="control_container_height_tabletui">96dp</dimen>
+     <dimen name="custom_tabs_control_container_height">@dimen/default_action_bar_height</dimen>
+ 
++    <!-- The combined height of the tab strip and toolbar. -->
++    <dimen name="tab_strip_and_toolbar_height_cromite">56dp</dimen>
++
+     <!-- Find in Page dimensions -->
+     <dimen name="find_in_page_popup_width">375dp</dimen>
+     <dimen name="find_in_page_popup_height">60dp</dimen>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
+@@ -61,6 +61,7 @@ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.content_public.browser.WebContentsObserver;
+ import org.chromium.net.NetId;
+ import org.chromium.ui.LayoutInflaterUtils;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.ui.display.DisplayUtil;
+ import org.chromium.url.GURL;
+@@ -454,7 +455,9 @@ public class WarmupManager {
+             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
+ 
+             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
+-                controlContainer.initWithToolbar(toolbarId);
++                controlContainer.initWithToolbar(toolbarId,
++                        DeviceFormFactor.isForceTabletUI()
++                            ? R.dimen.control_container_height_tabletui : 0);
+             }
+             return mainView;
+         } catch (InflateException e) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.settings.SettingsLauncherFactory;
+ import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
+ import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
++import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
+ import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
+ import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
+ import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
+@@ -47,6 +48,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public static final String PREF_ZOOM_INFO = "zoom_info";
+     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
+ 
++    private BooleanPreferenceDelegate mForceTabletUIDelegate;
++    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
++
+     private TextScalePreference mTextScalePref;
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+@@ -144,6 +148,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+                 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 -> {
+@@ -216,6 +226,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+             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
-@@ -94,6 +94,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
-         return new TextSizeContrastAccessibilityDelegate(getBrowserContextHandle());
+@@ -38,6 +38,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+         }
      }
  
 +    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
@@ -46,35 +185,104 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +        return new ForceTabletUIDelegate();
 +    }
 +
-     @Override
-     public void addExtraPreferences(PreferenceFragmentCompat fragment) {
-         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
-@@ -979,7 +979,9 @@ public final class ReturnToChromeUtil {
+     private final Profile mProfile;
  
-     public static boolean isScrollableMvtEnabled(Context context) {
-         boolean isSurfacePolishEnabled = ChromeFeatureList.sSurfacePolish.isEnabled();
--        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
-+        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) ||
-+             ChromeSharedPreferences.getInstance().readBoolean(
-+                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) {
-             // On phones, parameter SURFACE_POLISH_SCROLLABLE_MVT is checked when feature flag
-             // surface polish is enabled; otherwise, feature flag
-             // SHOW_SCROLLABLE_MVT_ON_NTP_PHONE_ANDROID is checked.
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
+@@ -869,7 +869,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             // Inflate the correct toolbar layout for the device.
+             int toolbarLayoutId = getToolbarLayoutId();
+             if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
+-                controlContainer.initWithToolbar(toolbarLayoutId);
++                controlContainer.initWithToolbar(toolbarLayoutId,
++                        DeviceFormFactor.isForceTabletUI()
++                            ? R.dimen.control_container_height_tabletui : 0);
+             }
+             onInitialLayoutInflationComplete();
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+@@ -89,6 +89,7 @@ import org.chromium.components.prefs.PrefService;
+ import org.chromium.components.tab_groups.TabGroupColorId;
+ import org.chromium.components.user_prefs.UserPrefs;
+ import org.chromium.ui.MotionEventUtils;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.LocalizationUtils;
+ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.ui.interpolators.Interpolators;
+@@ -5176,8 +5177,13 @@ public class StripLayoutHelper implements StripLayoutTabDelegate, StripLayoutGro
+         mTabMenu.setAnchorView(tabView);
+         // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
+         int tabHeight = mManagerHost.getHeight();
+-        int verticalOffset =
+-                -(tabHeight - (int) mContext.getResources().getDimension(R.dimen.tab_strip_height));
++        int tab_strip_height =
++            (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_cromite);
++        if (DeviceFormFactor.isForceTabletUI()) {
++            tab_strip_height =
++                (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_tabletui);
++        }
++        int verticalOffset = -(tabHeight - tab_strip_height);
+         mTabMenu.setVerticalOffset(verticalOffset);
+ 
+         // 4. Set the horizontal offset to align the tab menu with the right side of the tab
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+@@ -90,6 +90,7 @@ import org.chromium.chrome.browser.ui.system.StatusBarColorController;
+ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+ import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
+ import org.chromium.content_public.browser.LoadUrlParams;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.LocalizationUtils;
+ import org.chromium.ui.base.PageTransition;
+ import org.chromium.ui.base.WindowAndroid;
+@@ -455,11 +456,15 @@ public class StripLayoutHelperManager
+ 
+         mIsLayoutOptimizationsEnabled =
+                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
+-        mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
++        mScrollableStripHeight =
++            (DeviceFormFactor.isForceTabletUI()
++                ? res.getDimension(R.dimen.tab_strip_height_tabletui)
++                : res.getDimension(R.dimen.tab_strip_height_cromite)) / mDensity;
+         mHeight =
+                 mIsLayoutOptimizationsEnabled
+                         ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
+                         : mScrollableStripHeight;
++
+         mTopPadding = mHeight - mScrollableStripHeight;
+         mDesktopWindowStateProvider = desktopWindowStateProvider;
+         mStripVisibilityStateSupplier = new ObservableSupplierImpl<>(StripVisibilityState.UNKNOWN);
+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
+@@ -531,7 +531,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
-@@ -98,6 +98,7 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
- import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
+@@ -103,6 +103,7 @@ import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
+ import org.chromium.chrome.browser.pdf.PdfPage;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController;
+ import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
  import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -1595,7 +1596,9 @@ public class RootUiCoordinator
+@@ -1740,7 +1741,9 @@ public class RootUiCoordinator
          if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
  
          int stubId = R.id.find_toolbar_stub;
@@ -99,10 +307,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
-@@ -270,6 +270,7 @@ public final class ChromePreferenceKeys {
-             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
- 
-     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
+@@ -265,6 +265,7 @@ public final class ChromePreferenceKeys {
+     /** Whether the app-specific history info text was already seen by users. */
+     public static final String HISTORY_APP_SPECIFIC_INFO_SEEN =
+             "Chrome.History.AppSpecificInfoSeen";
 +    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";
  
      /** Keys used to save settings related to homepage. */
@@ -110,16 +318,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
-@@ -11,6 +11,8 @@ import org.chromium.base.shared_preferences.PreferenceKeyRegistry;
- import org.chromium.base.shared_preferences.SharedPreferencesManager;
+@@ -12,6 +12,8 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
  import org.chromium.build.BuildConfig;
+ import org.chromium.build.annotations.AssumeNonNull;
  
 +import org.chromium.ui.base.DeviceFormFactor;
 +
  @JNINamespace("android::shared_preferences")
  public class ChromeSharedPreferences {
      public static final PreferenceKeyRegistry REGISTRY =
-@@ -22,6 +24,12 @@ public class ChromeSharedPreferences {
+@@ -23,6 +25,12 @@ public class ChromeSharedPreferences {
                              LegacyChromePreferenceKeys.getPrefixesInUse())
                      : null);
  
@@ -135,7 +343,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
-@@ -58,6 +58,7 @@ public class LegacyChromePreferenceKeys {
+@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
                  ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                  ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
@@ -143,10 +351,21 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
                  ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
+diff --git a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
+--- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
++++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
+@@ -41,6 +41,7 @@ import org.chromium.components.browser_ui.widget.displaystyle.HorizontalDisplayS
+ import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
+ import org.chromium.components.browser_ui.widget.displaystyle.UiConfig.DisplayStyle;
+ import org.chromium.components.embedder_support.util.UrlUtilities;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.modelutil.PropertyModel;
+ import org.chromium.url.GURL;
+ 
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
-@@ -771,7 +771,7 @@ public class LocationBarCoordinator
+@@ -765,7 +765,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -158,8 +377,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
-@@ -1564,6 +1564,13 @@ Your Google account may have other forms of browsing history like searches and a
-         Manage third-party cookies and tracking protections
+@@ -1664,6 +1664,13 @@ Your Google account may have other forms of browsing history like searches and a
+         Hide your IP address
        </message>
  
 +      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
@@ -172,10 +391,186 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <!-- Safety check -->
        <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
          Safety check
+diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml b/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
+--- a/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
++++ b/chrome/browser/ui/android/toolbar/java/res/layout/control_container.xml
+@@ -9,7 +9,7 @@ found in the LICENSE file.
+     android:id="@+id/control_container"
+     android:layout_width="match_parent"
+     android:layout_height="wrap_content"
+-    android:minHeight="@dimen/control_container_height" >
++    android:minHeight="@dimen/control_container_height_cromite" >
+ 
+     <view
+         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
+@@ -20,7 +20,7 @@ found in the LICENSE file.
+         <ViewStub
+             android:id="@+id/toolbar_stub"
+             android:layout_width="match_parent"
+-            android:layout_marginTop="@dimen/tab_strip_height"
++            android:layout_marginTop="@dimen/tab_strip_height_cromite"
+             android:layout_height="@dimen/toolbar_height_no_shadow" />
+ 
+         <ImageView
+@@ -28,7 +28,7 @@ found in the LICENSE file.
+             android:src="@drawable/toolbar_hairline"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+-            android:layout_marginTop="@dimen/control_container_height"
++            android:layout_marginTop="@dimen/control_container_height_cromite"
+             android:scaleType="fitXY"
+             android:importantForAccessibility="no" />
+ 
+@@ -36,7 +36,7 @@ found in the LICENSE file.
+             android:id="@+id/find_toolbar_stub"
+             android:inflatedId="@+id/find_toolbar"
+             android:visibility="gone"
+-            android:layout_marginTop="@dimen/tab_strip_height"
++            android:layout_marginTop="@dimen/tab_strip_height_cromite"
+             android:layout_width="match_parent"
+             android:layout_height="@dimen/toolbar_height_no_shadow"
+             android:layout="@layout/find_toolbar" />
+@@ -55,7 +55,7 @@ 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" />
+ </org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer>
+diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
+--- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
++++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
+@@ -15,7 +15,7 @@ found in the LICENSE file.
+     android:id="@+id/toolbar"
+     android:layout_width="match_parent"
+     android:layout_height="@dimen/toolbar_height_no_shadow"
+-    android:layout_marginTop="@dimen/tab_strip_height"
++    android:layout_marginTop="@dimen/tab_strip_height_tabletui"
+     android:background="@macro/default_bg_color"
+      >
+ 
+diff --git a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml b/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
+--- a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
++++ b/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
+@@ -7,6 +7,7 @@ found in the LICENSE file.
+ 
+ <resources>
+     <!-- Tab Strip Dimensions -->
+-    <dimen name="tab_strip_height">40dp</dimen>
+-    <dimen name="tab_strip_reserved_top_padding">2dp</dimen>
++    <dimen name="tab_strip_height_cromite">40dp</dimen>
++    <dimen name="tab_strip_height_tabletui">40dp</dimen>
++    <dimen name="tab_strip_reserved_top_padding_cromite">2dp</dimen>
+ </resources>
+diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
+--- a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
++++ b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
+@@ -10,8 +10,9 @@ found in the LICENSE file.
+     <dimen name="toolbar_tab_count_text_size_2_digit">10dp</dimen>
+ 
+     <!-- Tab Strip Dimensions -->
+-    <dimen name="tab_strip_height">0dp</dimen>
+-    <dimen name="tab_strip_reserved_top_padding">0dp</dimen>
++    <dimen name="tab_strip_height_cromite">0dp</dimen>
++    <dimen name="tab_strip_height_tabletui">40dp</dimen>
++    <dimen name="tab_strip_reserved_top_padding_cromite">0dp</dimen>
+ 
+     <dimen name="ntp_search_box_height">64dp</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.
+      * @param toolbarLayoutId The ID of the toolbar layout to use.
+      */
+-    void initWithToolbar(int toolbarLayoutId);
++    void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId);
+ 
+     /**
+      * @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+@@ -5,6 +5,7 @@
+ package org.chromium.chrome.browser.toolbar.top;
+ 
+ import android.content.Context;
++import android.content.res.Resources;
+ import android.graphics.Canvas;
+ import android.graphics.PorterDuff;
+ import android.graphics.Rect;
+@@ -119,8 +120,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+     }
+ 
+     @Override
+-    public void initWithToolbar(int toolbarLayoutId) {
++    public void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId) {
+         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
++            if (controlContainerHeightOverrideId != 0) {
++                Resources res = getContext().getResources();
++                setMinimumHeight((int) res.getDimension(controlContainerHeightOverrideId));
++                int tab_strip_height =
++                    (int) res.getDimension(R.dimen.tab_strip_height_tabletui);
++
++                View view = findViewById(R.id.toolbar_stub);
++                if (view != null)
++                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
++
++                view = findViewById(R.id.toolbar_hairline);
++                if (view != null) view.setVisibility(View.GONE);
++
++                view = findViewById(R.id.find_toolbar_stub);
++                if (view != null)
++                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
++
++                view = findViewById(R.id.target_view_stub);
++                if (view != null)
++                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
++            }
+             mToolbarContainer =
+                     (ToolbarViewResourceFrameLayout) findViewById(R.id.toolbar_container);
+             ViewStub toolbarStub = findViewById(R.id.toolbar_stub);
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
+@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+ import org.chromium.components.feature_engagement.Tracker;
+ import org.chromium.ui.UiUtils;
+ import org.chromium.ui.base.ViewUtils;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.util.TokenHolder;
+ import org.chromium.url.GURL;
+ 
+@@ -634,7 +635,9 @@ public abstract class ToolbarLayout extends FrameLayout
+      * not have a tab strip.
+      */
+     protected int getTabStripHeightFromResource() {
+-        return getResources().getDimensionPixelSize(R.dimen.tab_strip_height);
++        if (DeviceFormFactor.isForceTabletUI())
++            return getResources().getDimensionPixelSize(R.dimen.tab_strip_height_tabletui);
++        return getResources().getDimensionPixelSize(R.dimen.tab_strip_height_cromite);
+     }
+ 
+     /** Triggered when the content view for the specified tab has changed. */
+diff --git a/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
+@@ -151,7 +151,7 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+         mTabStripReservedTopPadding =
+                 controlContainerView()
+                         .getResources()
+-                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding);
++                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding_cromite);
+ 
+         mOnLayoutChangedListener =
+                 (view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
 diff --git a/components/BUILD.gn b/components/BUILD.gn
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
-@@ -69,7 +69,7 @@ if (is_ios) {
+@@ -70,7 +70,7 @@ if (is_ios) {
  
  # Omit Lacros because it allows //components to depend on //chrome, which in
  # turn depends on //extensions.
@@ -184,7 +579,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
    disallowed_extension_deps_ = [
      # Components should largely not depend on //extensions. Since // extensions
      # is not a component target and is linked with //chrome, depending on most
-@@ -831,7 +831,7 @@ test("components_unittests") {
+@@ -868,7 +868,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.
@@ -193,7 +588,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
      assert_no_deps = [ "//chrome/*" ]
      assert_no_deps += disallowed_extension_deps_
    }
-@@ -1113,7 +1113,7 @@ if (use_blink) {
+@@ -1161,7 +1161,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.
@@ -205,7 +600,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
 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.
+@@ -41,6 +41,11 @@ found in the LICENSE file.
          android:summary="@string/reader_for_accessibility_summary"
          android:title="@string/reader_for_accessibility_title" />
  
@@ -217,68 +612,53 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
      <Preference
          android:key="captions"
          android:title="@string/accessibility_captions_title"/>
-diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
---- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -32,6 +32,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     public static final String PREF_CAPTIONS = "captions";
-     public static final String PREF_ZOOM_INFO = "zoom_info";
- 
-+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
-+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -129,6 +131,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             getPreferenceScreen().removePreference(readerForAccessibilityPref);
-         }
- 
-+        ChromeSwitchPreference forceTabletUiPref =
-+                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
-+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
-+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
-+        forceTabletUiPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -190,6 +198,8 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
-         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
-             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
-+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
-+            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
-         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
-             if (mReaderForAccessibilityDelegate != null) {
-                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -52,6 +52,8 @@ public interface AccessibilitySettingsDelegate {
-      */
-     IntegerPreferenceDelegate getTextSizeContrastAccessibilityDelegate();
+@@ -11,6 +11,15 @@ import org.chromium.content_public.browser.BrowserContextHandle;
+  * embedder-specific logic.
+  */
+ public interface AccessibilitySettingsDelegate {
++    /** An interface to control a single boolean preference. */
++    interface BooleanPreferenceDelegate {
++        /** @return whether the preference is enabled. */
++        boolean isEnabled();
++
++        /** Called when the preference value is changed. */
++        void setEnabled(boolean value);
++    }
++
+     /** An interface to control a single integer preference. */
+     interface IntegerPreferenceDelegate {
+         /** @return int - Current value of the preference of this instance. */
+@@ -26,6 +35,8 @@ public interface AccessibilitySettingsDelegate {
+     /** @return The BrowserContextHandle that should be used to read and update settings. */
+     BrowserContextHandle getBrowserContextHandle();
  
 +    BooleanPreferenceDelegate getForceTabletUIDelegate();
 +
      /**
-      * Allows the embedder to add more preferences to the preference screen.
-      *
+      * @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.
 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,11 @@ public class DeviceFormFactor {
+@@ -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;
  
-+    private static boolean mForceTabletUI;
++    private static boolean mForceTabletUI = true;
 +    public static void setForceTabletUI(boolean forceTabletUI) {
 +        mForceTabletUI = forceTabletUI;
 +    }
++    public static boolean isForceTabletUI() {
++        return mForceTabletUI;
++    }
 +
      /**
       * Each activity could be on a different display, and this will just tell you whether the
       * display associated with the application context is "tablet sized".
-@@ -56,6 +61,7 @@ public class DeviceFormFactor {
+@@ -56,6 +64,7 @@ public class DeviceFormFactor {
       *         E.g. http://developer.samsung.com/samsung-dex/testing
       */
      public static boolean isNonMultiDisplayContextOnTablet(Context context) {

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

@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -71,6 +71,11 @@ found in the LICENSE file.
+@@ -91,6 +91,11 @@ found in the LICENSE file.
          android:title="@string/incognito_settings_title"
          android:summary="@string/incognito_settings_summary"
          android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.base.IntentUtils;
  import org.chromium.base.Log;
  import org.chromium.base.MemoryPressureListener;
-@@ -1614,8 +1615,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1477,8 +1478,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -58,8 +58,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +import android.content.SharedPreferences;
  import android.os.Bundle;
  import android.text.SpannableString;
- import android.text.style.ForegroundColorSpan;
-@@ -20,6 +21,8 @@ import androidx.preference.Preference;
+ import android.view.Menu;
+@@ -18,6 +19,8 @@ import androidx.preference.Preference;
  
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
@@ -68,16 +68,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -87,6 +90,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -83,6 +86,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 IncognitoLockSettings mIncognitoLockSettings;
- 
-@@ -271,7 +276,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection";
+     @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection";
+@@ -309,7 +314,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -90,8 +90,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
-@@ -316,6 +325,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-                     PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
+@@ -371,6 +380,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                             getContext(), getProfile()));
          }
  
 +        ChromeSwitchPreference closeTabsOnExitPref =
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4805,6 +4805,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -5391,6 +5391,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>

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

@@ -6,8 +6,8 @@ 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 ++++++++-
  .../tasks/tab_management/TabGroupUiMediator.java |  8 +++++++-
+ .../browser/tasks/tab_management/TabUiUtils.java |  9 ++++++++-
  .../java/res/xml/homepage_preferences.xml        |  5 +++++
  .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++
  .../homepage/settings/HomepageSettings.java      | 12 ++++++++++++
@@ -20,47 +20,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/common/pref_names.h                       |  4 ++++
  12 files changed, 67 insertions(+), 3 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
-@@ -22,6 +22,7 @@ import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.Supplier;
- import org.chromium.base.task.PostTask;
- import org.chromium.base.task.TaskTraits;
-+import org.chromium.chrome.browser.homepage.HomepageManager;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabCreationState;
- import org.chromium.chrome.browser.tab.TabLaunchType;
-@@ -47,6 +48,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate;
- import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.ui.text.EmptyTextWatcher;
-+import org.chromium.url.GURL;
- 
- import java.util.ArrayList;
- import java.util.List;
-@@ -636,11 +638,16 @@ public class TabGridDialogMediator
- 
-             assert relatedTabs.size() > 0;
- 
-+            String url = UrlConstants.NTP_URL;
-+            if (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);
-             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;
+@@ -20,6 +20,7 @@ import org.chromium.base.supplier.LazyOneshotSupplier;
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.ObservableSupplierImpl;
  import org.chromium.base.supplier.OneshotSupplier;
@@ -68,7 +31,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -375,10 +376,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -433,10 +434,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                      assert relatedTabs.size() > 0;
  
                      parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -85,6 +48,33 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                                      TabLaunchType.FROM_TAB_GROUP_UI,
                                      parentTabToAttach);
                      RecordUserAction.record(
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
++++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
+@@ -31,6 +31,8 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
+ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+ import org.chromium.components.tab_groups.TabGroupColorId;
+ import org.chromium.content_public.browser.LoadUrlParams;
++import org.chromium.chrome.browser.homepage.HomepageManager;
++import org.chromium.url.GURL;
+ 
+ import java.util.List;
+ import java.util.Objects;
+@@ -191,8 +193,13 @@ public class TabUiUtils {
+         List<Tab> relatedTabs = filter.getRelatedTabList(tabId);
+         assert relatedTabs.size() > 0;
+ 
++        String url = UrlConstants.NTP_URL;
++        if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
++            GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++            url = gurl != null ? gurl.getSpec() : url;
++        }
+         Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
+-        tabCreator.createNewTab(new LoadUrlParams(UrlConstants.NTP_URL), type, parentTabToAttach);
++        tabCreator.createNewTab(new LoadUrlParams(url), type, parentTabToAttach);
+     }
+ 
+     /**
 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
@@ -103,7 +93,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -233,6 +233,22 @@ public class HomepageManager
+@@ -237,6 +237,22 @@ public class HomepageManager
          notifyHomepageUpdated();
      }
  
@@ -165,7 +155,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
-@@ -112,7 +112,6 @@ public class LaunchMetrics {
+@@ -111,7 +111,6 @@ public class LaunchMetrics {
      public static void recordHomePageLaunchMetrics(
              boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
          if (homepageGurl.isEmpty()) {
@@ -181,10 +171,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.new_tab_url.DseNewTabUrlManager;
 +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;
-@@ -484,6 +485,13 @@ public class ChromeTabCreator extends TabCreator {
+ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -486,6 +487,13 @@ public class ChromeTabCreator extends TabCreator {
       * @return the created tab.
       */
      public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@@ -201,7 +191,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -283,6 +283,7 @@ public final class ChromePreferenceKeys {
+@@ -278,6 +278,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 +202,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -62,6 +62,7 @@ public class LegacyChromePreferenceKeys {
+@@ -61,6 +61,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
                  ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -223,7 +213,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1337,6 +1337,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1453,6 +1453,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,27 +226,27 @@ 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
-@@ -73,6 +73,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
-   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
+@@ -91,6 +91,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(
+       prefs::kShowForwardButton, true,
+       GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags());
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
 +                                PrefRegistry::NO_REGISTRATION_FLAGS);
  
    registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
-   bool reset_check_default = false;
+   registry->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1285,6 +1285,10 @@ inline constexpr char kUsedPolicyCertificates[] =
- // visible on the toolbar.
- inline constexpr char kShowHomeButton[] = "browser.show_home_button";
+@@ -1361,6 +1361,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
+ // toolbar.
+ inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
  
 +// 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.
 --

build/patches/Add-search-engine.patch

@@ -8,15 +8,59 @@ Add DuckDuckGo Lite
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../search_engines/prepopulated_engines.json  | 31 +++++++++++++++++++
- .../search_engines/search_engine_type.h       |  5 +++
- .../template_url_prepopulate_data.cc          |  3 ++
- 3 files changed, 39 insertions(+)
+ .../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_choice_utils.cc             |   5 +--
+ .../search_engine_countries-inc.cc            |   3 ++
+ .../search_engines/search_engine_type.h       |   5 +++
+ .../template_url_prepopulate_data.cc          |   1 -
+ .../template_url_prepopulate_data.h           |   7 ----
+ 8 files changed, 41 insertions(+), 12 deletions(-)
+ create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
 
+diff --git a/components/resources/default_100_percent/search_engine_choice/default_favicon.png b/components/resources/default_100_percent/search_engine_choice/default_favicon.png
+new file mode 100644
+index 0000000000000000000000000000000000000000..6533419f2d6b40f7735054dec62c51ddf1ee1201
+GIT binary patch
+literal 903
+zcmV;219<$2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009{Nkl<Zc-rk*
+zHI&>u5dJaD%uTpU6K1Ny)MmAo?2~ki?Li;rI(@haGcz+YGo$8ZtH|rstmUBf-W*z<
+z`LqMyjQ;vbR=naxn4FxTa$SOo%Y^Yq3CiCp`IM5k@HhA$JOj`EJVrBqK*>90<Y$Z!
+zD&E1~9|C4N=Y0}PoKKzZ=aBLV-UaWB-0*4BX4X}1up41G3JAO#bVTDWd3iku6Hh={
+zlma?HmsR5(hfh(b^FD*}4@!0sS4zV2hPiHTHz{QUr=p@EW3ne<xuXf?=gfeJ_n_0B
+z@lJY|QARx>G)Ly==Qj#^Pm*zg`6NIm=nm~RX-}Ss_k_usva+)JncnmH^XI=4jNih$
+zlz0y|WF4^Se4bG8m@v`L_#mWg6DB6I3T(&-X<X(aWBDC2?f1MT|2uB(BxS%X1$a%k
+z;1;{ldEPHo!pWN$|21g&X`3k)RVSdZ`1-to+dxbxpx11tSFj1eY4p>FfHecpOCzcg
+zpNwb+@DsmO2`6iI0DN;)MGkB;0q{--kR#0r9={VIfOiJ&qgPlcQV0O=qNN%EZUkK2
+zXVWfZ`h5{40I)Gg`DG2UD<uwqtRPHQ`3e=w!vhePgFgO88URJiY>`5mlRG3V0I)IO
+z^!VFvHvp@&1;F!4TUc<Tw?P23{124aYG2{<#pZ1%U*J~{i~%4NJtI_HQU19p>56LN
+z%3gt$n(-Z(idK@zIi#qli66~IxloAGzuNPP+NSLfTs{_pT7f^J06kI9KUZ>A$&#d(
+z+ZUd3gy@cNAuWhQ3vePzWtVK-4H5_<h_y6oOLkRNRsEA)yhw>iqgo-eCg3jF08o2(
+zV+xr@B`n6nQmpYnUx3CSsDwu5Yyvoe1poxnZ<>do)Aj_?EW-9wQ^cQO=(N_*SpEcF
+zA!n{N_=ZMrDQ)uj`{u@re$c++TFQW?-c&%T<H_NEl62(&6TL7nfTD(I>Jej=5G2dk
+zc*-y0$13Q-mVE%=HZZcm54P~5#qa<$Vkc|B{qUnj<Z#y}04P$B=OI-_I^4yL*CEaE
+zjS0pJfK7T{VJFY4st5f9G(|wnQru>jUSTzPpE5qa;Lv>bM_w_-mwYy_S=Aoxnl--Y
+d#;<tA>kFnu^?NN9uE_uZ002ovPDHLkV1m60sc!%P
+
+literal 0
+HcmV?d00001
+
+diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/components/resources/search_engine_choice_scaled_resources.grdp
+--- a/components/resources/search_engine_choice_scaled_resources.grdp
++++ b/components/resources/search_engine_choice_scaled_resources.grdp
+@@ -5,6 +5,7 @@
+   <if expr="_google_chrome">
+     <structure type="chrome_scaled_image" name="IDR_GOOGLE_COM_PNG" file="google_chrome/google_search_logo.png" />
+   </if>
++  <structure type="chrome_scaled_image" name="IDR_GOOGLEEN_PNG" file="search_engine_choice/default_favicon.png" />
+   <structure type="chrome_scaled_image" name="IDR_AR_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
+   <structure type="chrome_scaled_image" name="IDR_AT_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
+   <structure type="chrome_scaled_image" name="IDR_AU_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -113,6 +113,16 @@
+@@ -115,6 +115,16 @@
        "id": 92
      },
  
@@ -33,7 +77,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
      "ecosia": {
        "name": "Ecosia",
        "keyword": "ecosia.org",
-@@ -171,6 +181,27 @@
+@@ -184,6 +194,27 @@
        "id": 111
      },
  
@@ -61,15 +105,49 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
      "mail_ru": {
        "name": "@MAIL.RU",
        "keyword": "mail.ru",
+diff --git a/components/search_engines/search_engine_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
+@@ -219,10 +219,7 @@ void RecordChoiceScreenDefaultSearchProviderType(SearchEngineType engine_type) {
+ }
+ 
+ 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_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
+@@ -38,6 +38,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},
+@@ -1454,5 +1455,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
+   for (size_t i = 0; i < num_engines; i++) {
+     t_url.push_back(engines[i]);
+   }
++  t_url.push_back({SearchEngineTier::kTopEngines, &googleen});
++  t_url.push_back({SearchEngineTier::kTopEngines, &duckduckgo_light});
+   return t_url;
+ }
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -90,10 +90,15 @@ enum SearchEngineType {
-   SEARCH_ENGINE_KARMA = 71,
+@@ -91,10 +91,15 @@ enum SearchEngineType {
    SEARCH_ENGINE_YOU = 72,
    SEARCH_ENGINE_STARTER_PACK_ASK_GOOGLE = 73,
-+  SEARCH_ENGINE_GOOGLE_EN = 74,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 75,
+   SEARCH_ENGINE_LILO = 74,
++  SEARCH_ENGINE_GOOGLE_EN = 75,
++  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
  
    SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
  };
@@ -83,21 +161,29 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -63,6 +63,7 @@ struct EngineAndTier {
+@@ -85,7 +85,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
+   generator.seed(profile_seed);
+   std::shuffle(t_urls.begin(), t_urls.end(), generator);
  
- // Default (for countries with no better engine set)
- constexpr EngineAndTier engines_default[] = {
-+    {SearchEngineTier::kTopEngines, &googleen},
-     {SearchEngineTier::kTopEngines, &google},
-     {SearchEngineTier::kTopEngines, &bing},
-     {SearchEngineTier::kTopEngines, &yahoo},
-@@ -1683,6 +1684,8 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
-   for (size_t i = 0; i < num_engines; i++) {
-     t_url.push_back(engines[i]);
-   }
-+  t_url.push_back({SearchEngineTier::kTopEngines, &googleen});
-+  t_url.push_back({SearchEngineTier::kTopEngines, &duckduckgo_light});
-   return t_url;
+-  CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines);
+   return t_urls;
  }
  
+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
+@@ -31,13 +31,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.
+-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()`.
+ inline constexpr size_t kMaxRowPrepopulatedEngines = 5;
 --

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

@@ -12,7 +12,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  chrome/app/settings_strings.grdp              | 10 +++
  .../browsing_data/browsing_data_bridge.cc     |  2 +-
  .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
- .../chrome_browsing_data_remover_delegate.cc  | 11 +++
+ .../chrome_browsing_data_remover_constants.h  |  3 +-
+ .../chrome_browsing_data_remover_delegate.cc  | 18 +++++
+ chrome/browser/dips/dips_service.cc           |  2 +-
  .../api/settings_private/prefs_util.cc        | 17 +++++
  .../browser/profiles/ProfileManagerUtils.java |  5 ++
  .../profiles/android/profile_manager_utils.cc |  5 ++
@@ -22,20 +24,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../clear_browsing_data_dialog.ts             |  2 +
  .../strings/android_chrome_strings.grd        |  3 +
  .../settings_localized_strings_provider.cc    |  1 +
+ .../content/browsing_data_helper.cc           |  9 ++-
  .../core/browsing_data_policies_utils.cc      | 20 ++---
  .../core/browsing_data_policies_utils.h       | 11 +++
- .../browsing_data/core/browsing_data_utils.cc | 34 +++++++++
+ .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
  .../core/clear_browsing_data_tab.h            |  2 +-
  components/browsing_data/core/pref_names.cc   | 17 +++++
  components/browsing_data/core/pref_names.h    | 10 +++
+ .../search_engines/template_url_service.cc    |  1 +
  content/browser/storage_partition_impl.cc     |  1 +
- 25 files changed, 312 insertions(+), 17 deletions(-)
+ 29 files changed, 326 insertions(+), 22 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -307,6 +307,7 @@ chrome_java_sources = [
+@@ -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",
@@ -46,15 +50,15 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -169,6 +169,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -171,6 +171,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.reengagement.ReengagementNotificationController;
- import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification;
-@@ -1614,7 +1615,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+ import org.chromium.chrome.browser.safety_hub.SafetyHubMagicStackBuilder;
+@@ -1477,7 +1478,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              Intent intent = getIntent();
  
              boolean hadCipherData =
@@ -70,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -435,6 +435,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -452,6 +452,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
      /** Returns whether is a basic or advanced Clear Browsing Data tab. */
      protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
  
@@ -81,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      /**
       * Decides whether a given dialog option should be selected when the dialog is initialized.
       *
-@@ -514,6 +518,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -532,6 +536,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
       * options.
       */
      private void onClearButtonClicked() {
@@ -89,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -546,6 +551,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -564,6 +569,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
          Button clearButton = (Button) getView().findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
@@ -161,7 +165,7 @@ new file mode 100644
 +    }
 +
 +    @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);
@@ -188,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
  
      private Profile mProfile;
      private ClearBrowsingDataFetcher mFetcher;
-@@ -93,6 +93,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -113,6 +113,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);
@@ -197,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              default:
                  throw new RuntimeException("invalid position: " + position);
          }
-@@ -136,6 +138,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -161,6 +163,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
                  case 1:
                      fragment = new ClearBrowsingDataFragmentAdvanced();
                      break;
@@ -210,9 +214,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2244,6 +2244,16 @@
-   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for clear browsing data button in Privacy options">
-     Clear browsing data
+@@ -2433,6 +2433,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.">
@@ -224,13 +228,13 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 +      At Startup
 +    </message>
 +  </if>
-   <message name="IDS_SETTINGS_CLEAR_DATA_DESCRIPTION" desc="Description for 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/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
-@@ -331,7 +331,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
+@@ -340,7 +340,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
      const JavaParamRef<jobject>& jprofile,
      jint tab_index) {
    DCHECK_GE(tab_index, 0);
@@ -278,10 +282,23 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
    bool sync_disabled = !SyncServiceFactory::IsSyncAllowed(profile_);
    // Condition is satisfied if sync is fully disabled by policy.
    if (sync_disabled) {
+diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
++++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h
+@@ -32,8 +32,7 @@ constexpr DataType DATA_TYPE_SITE_USAGE_DATA = DATA_TYPE_EMBEDDER_BEGIN << 4;
+ constexpr DataType DATA_TYPE_DURABLE_PERMISSION = DATA_TYPE_EMBEDDER_BEGIN << 5;
+ constexpr DataType DATA_TYPE_EXTERNAL_PROTOCOL_DATA = DATA_TYPE_EMBEDDER_BEGIN
+                                                       << 6;
+-constexpr DataType DATA_TYPE_HOSTED_APP_DATA_TEST_ONLY =
+-    DATA_TYPE_EMBEDDER_BEGIN << 7;
++constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = DATA_TYPE_EMBEDDER_BEGIN << 7;
+ constexpr DataType DATA_TYPE_CONTENT_SETTINGS = DATA_TYPE_EMBEDDER_BEGIN << 8;
+ constexpr DataType DATA_TYPE_BOOKMARKS = DATA_TYPE_EMBEDDER_BEGIN << 9;
+ constexpr DataType DATA_TYPE_ISOLATED_ORIGINS = DATA_TYPE_EMBEDDER_BEGIN << 10;
 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
-@@ -436,6 +436,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -454,6 +454,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -291,7 +308,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -486,7 +489,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -504,7 +507,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            prerender::NoStatePrefetchManager::CLEAR_PRERENDER_CONTENTS |
            prerender::NoStatePrefetchManager::CLEAR_PRERENDER_HISTORY);
      }
@@ -301,7 +318,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      // The saved Autofill profiles and credit cards can include the origin from
      // which these profiles and credit cards were learned.  These are a form of
      // history, so clear them as well.
-@@ -507,7 +512,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -525,7 +530,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
        if (data_manager)
          data_manager->Refresh();
      }
@@ -311,7 +328,19 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      base::ThreadPool::PostTaskAndReply(
          FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
          base::BindOnce(
-@@ -582,9 +589,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -572,6 +579,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 & chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE) {
++        skip = true;
++      }
++      if (!skip)
+       profile_->GetSSLHostStateDelegate()->Clear(
+           filter_builder->MatchesAllOriginsAndDomains()
+               ? base::RepeatingCallback<bool(const std::string&)>()
+@@ -600,9 +612,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -325,10 +354,31 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
+@@ -1293,6 +1309,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+ 
+     if (should_clear_zero_suggest_and_session_token && template_url_service)
+       template_url_service->ClearSessionToken();
++
++    template_url_service->RemoveAutoGeneratedBetween(delete_begin_, delete_end_);
+   }
+ 
+   //////////////////////////////////////////////////////////////////////////////
+diff --git a/chrome/browser/dips/dips_service.cc b/chrome/browser/dips/dips_service.cc
+--- a/chrome/browser/dips/dips_service.cc
++++ b/chrome/browser/dips/dips_service.cc
+@@ -188,7 +188,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
+     }
+     remover->RemoveWithFilterAndReply(
+         base::Time::Min(), base::Time::Max(),
+-        remove_mask |
++        remove_mask | chrome_browsing_data_remover::DATA_TYPE_SKIP_SSL_HOST_STATE |
+             content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
+         content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
+             content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
 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
-@@ -513,6 +513,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -529,6 +529,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -374,7 +424,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);
  }
@@ -386,7 +436,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1488,6 +1488,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1467,6 +1467,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
    }
  }
  
@@ -406,7 +456,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_ ||
-@@ -2155,7 +2168,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2181,7 +2194,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()) {
@@ -430,7 +480,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
-@@ -305,6 +305,50 @@
+@@ -318,6 +318,50 @@
                  disabled="[[clearingInProgress_]]" no-set-pref>
              </settings-checkbox>
            </div>
@@ -478,13 +528,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
-@@ -302,6 +302,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -297,6 +297,7 @@ export class SettingsClearBrowsingDataDialogElement extends
          value: () =>
              [loadTimeData.getString('basicPageTitle'),
               loadTimeData.getString('advancedPageTitle'),
@@ -492,20 +542,20 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
      ],
        },
  
-@@ -425,6 +426,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -423,6 +424,7 @@ export class SettingsClearBrowsingDataDialogElement extends
      }
      this.clearButtonDisabled_ =
-         this.getSelectedDataTypes_(tab as HTMLElement).length === 0;
-+    if ((tab as HTMLElement).id == "atstart-tab") this.clearButtonDisabled_ = true;
+         this.getSelectedDataTypes_(page as HTMLElement).length === 0;
++    if ((page as HTMLElement).id == "atstart-tab") this.clearButtonDisabled_ = true;
    }
  
    /**
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1432,6 +1432,9 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_CLEAR_BROWSING_DATA_BASIC_TAB_TITLE" desc="The title of the tab showing the basic clear browsing data options.">
-         Basic
+@@ -1548,6 +1548,9 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
+         Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
        </message>
 +      <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
@@ -516,7 +566,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1674,6 +1674,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1814,6 +1814,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -524,6 +574,25 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
        {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
        {"safeBrowsingEnableExtendedReportingDesc",
         IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
+diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc
+--- a/components/browsing_data/content/browsing_data_helper.cc
++++ b/components/browsing_data/content/browsing_data_helper.cc
+@@ -40,8 +40,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/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
@@ -583,7 +652,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,40 @@ bool GetDeletionPreferenceFromDataType(
+@@ -318,6 +318,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -595,7 +664,7 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::CACHE:
 +        *out_pref = prefs::kDeleteCacheAtStart;
 +        return true;
-+      case BrowsingDataType::COOKIES:
++      case BrowsingDataType::SITE_DATA:
 +        *out_pref = prefs::kDeleteCookiesAtStart;
 +        return true;
 +      case BrowsingDataType::PASSWORDS:
@@ -604,8 +673,6 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::FORM_DATA:
 +        *out_pref = prefs::kDeleteFormDataAtStart;
 +        return true;
-+      case BrowsingDataType::BOOKMARKS:
-+        return false;
 +      case BrowsingDataType::SITE_SETTINGS:
 +        *out_pref = prefs::kDeleteSiteSettingsAtStart;
 +        return true;
@@ -615,8 +682,7 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 +      case BrowsingDataType::HOSTED_APPS_DATA:
 +        *out_pref = prefs::kDeleteHostedAppsDataAtStart;
 +        return true;
-+      case BrowsingDataType::NUM_TYPES:
-+        NOTREACHED();  // This is not an actual type.
++      case BrowsingDataType::TABS:
 +        return false;
 +    }
 +  }
@@ -631,15 +697,15 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
  //
  // A Java counterpart will be generated for this enum.
  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
--enum class ClearBrowsingDataTab { BASIC, ADVANCED, NUM_TYPES };
-+enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, NUM_TYPES };
+-enum class ClearBrowsingDataTab { BASIC, ADVANCED, MAX_VALUE = ADVANCED };
++enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, MAX_VALUE = AT_START };
  
  }  // namespace browsing_data
  
 diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
 --- a/components/browsing_data/core/pref_names.cc
 +++ b/components/browsing_data/core/pref_names.cc
-@@ -47,6 +47,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -29,6 +29,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(
        kClearBrowsingDataHistoryNoticeShownTimes, 0);
  
@@ -661,8 +727,8 @@ diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_d
 +      kDeleteSiteSettingsAtStart, false);
 +
  #if !BUILDFLAG(IS_IOS)
-   registry->RegisterBooleanPref(
-       kDeleteDownloadHistory, true,
+   registry->RegisterBooleanPref(kDeleteDownloadHistory, true);
+   registry->RegisterBooleanPref(kDeleteHostedAppsData, false);
 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
@@ -683,10 +749,21 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
  // Clear browsing data deletion time period.
  inline constexpr char kDeleteTimePeriod[] = "browser.clear_data.time_period";
  inline constexpr char kDeleteTimePeriodBasic[] =
+diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
+--- a/components/search_engines/template_url_service.cc
++++ b/components/search_engines/template_url_service.cc
+@@ -798,6 +798,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+     if (turl->date_created() >= created_after &&
+         (created_before.is_null() || turl->date_created() < created_before) &&
+         turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
++        turl->is_active() != TemplateURLData::ActiveStatus::kTrue &&
+         turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
+         (url_filter.is_null() ||
+          url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1488,6 +1488,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1471,6 +1471,7 @@ void StoragePartitionImpl::Initialize(
                              .AppendASCII("Code Cache");
      }
      DCHECK_GE(settings.size_in_bytes(), 0);

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

@@ -8,36 +8,58 @@ 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  | 11 ++++++
  .../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 +
  .../renderer/core/html/html_anchor_element.cc | 36 +++++++++++++++----
- .../renderer/core/html/html_anchor_element.h  |  9 +++--
+ .../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      | 32 ++++++++++++-----
+ .../core/page/context_menu_controller.cc      | 33 ++++++++++++-----
  .../core/page/context_menu_controller.h       |  5 +--
- 21 files changed, 164 insertions(+), 21 deletions(-)
+ 22 files changed, 170 insertions(+), 20 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.components.embedder_support.contextmenu.ContextMenuItemDelegate;
+ import org.chromium.components.embedder_support.contextmenu.ContextMenuParams;
++import org.chromium.content_public.common.Referrer;
+ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.ui.base.Clipboard;
+ import org.chromium.url.GURL;
+@@ -54,6 +55,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
+         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.
+@@ -88,6 +88,7 @@ found in the LICENSE file.
  
      <!-- Menu item IDs for FullscreenActivities -->
      <item type="id" name="contextmenu_open_in_chrome" />
@@ -45,10 +67,46 @@ 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
+@@ -56,6 +56,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
+     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
+ 
++    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
++    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
++
+     private TextScalePreference mTextScalePref;
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+@@ -175,6 +178,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+         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 -> {
+@@ -264,6 +273,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+             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
-@@ -163,6 +163,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -136,6 +136,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
              mSnackbarManager.showSnackbar(mSnackbar);
      }
  
@@ -71,8 +129,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +    }
 +
      @Override
-     public void addExtraPreferences(PreferenceFragmentCompat fragment) {
-         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
+     public BrowserContextHandle getBrowserContextHandle() {
+         return mProfile;
 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
@@ -106,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -266,6 +266,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -273,6 +273,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
  
          if (mParams.isAnchor()) {
              ModelList linkGroup = new ModelList();
@@ -116,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
              if (FirstRunStatus.getFirstRunFlowComplete()
                      && !isEmptyUrl(mParams.getUrl())
                      && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -631,6 +634,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -638,6 +641,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -128,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -273,6 +273,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -328,6 +328,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
          mTab.loadUrl(loadUrlParams);
      }
  
@@ -139,29 +197,17 @@ 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
-@@ -280,6 +280,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -312,6 +312,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabGroupCreationDialogAndroid,
      &kTabGroupParityAndroid,
      &kTabletTabSwitcherLongPressMenu,
-     &kTabletToolbarIncognitoStatus,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
      &kTabletToolbarReordering,
      &kTabResumptionModuleAndroid,
@@ -169,8 +215,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -342,6 +342,8 @@ public abstract class ChromeFeatureList {
-     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
+@@ -378,6 +378,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 =
@@ -178,29 +224,29 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
              "NotificationPermissionBottomSheet";
-@@ -619,6 +621,8 @@ public abstract class ChromeFeatureList {
-             newCachedFlag(OMNIBOX_MATCH_TOOLBAR_AND_STATUS_BAR_COLOR, false);
+@@ -669,6 +671,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 sPrivacyGuidePreloadAndroid =
+             newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);
      public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -771,6 +775,7 @@ public abstract class ChromeFeatureList {
+@@ -828,6 +832,7 @@ public abstract class ChromeFeatureList {
+                     sTabWindowManagerIndexReassignmentActivityNotInAppTasks,
                      sTabWindowManagerReportIndicesMismatch,
-                     sToolbarUseHardwareBitmapDraw,
                      sUseChimeAndroidSdk,
 +                    sShowAlwaysContextMenuOnLinks,
                      sUseLibunwindstackNativeUnwinderAndroid,
-                     sVerticalAutomotiveBackButtonToolbar);
- 
+                     sVerticalAutomotiveBackButtonToolbar,
+                     sWebApkMinShellApkVersion);
 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
-@@ -1638,6 +1638,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_MOVE_TOOLBAR_BOTTOM_SUMMARY" desc="Summary of the preference that allows the user to move toolbar on bottom.">
-         Move toolbar to bottom
+@@ -1729,6 +1729,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
+         Disable toolbar swipe up
        </message>
 +      <message name="IDS_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS_TITLE" desc="Title of the preference that open the context menu in links.">
 +        Always open the context menu in the links
@@ -211,7 +257,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Safety check -->
        <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
-@@ -2779,6 +2785,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -3192,6 +3198,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>
@@ -224,7 +270,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -35,6 +35,11 @@ found in the LICENSE file.
+@@ -36,6 +36,11 @@ found in the LICENSE file.
          android:summary="@string/page_zoom_always_show_preference_summary"
          android:title="@string/page_zoom_always_show_preference_title" />
  
@@ -236,60 +282,38 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
          android:key="force_enable_zoom"
          android:summary="@string/force_enable_zoom_summary"
-diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
---- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -35,6 +35,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     private BooleanPreferenceDelegate mForceTabletUIDelegate;
-     static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
-     static final String PREF_MOVE_TOOLBAR_TO_BOTTOM = "move_toolbar_bottom";
-+    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -45,6 +46,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     private BooleanPreferenceDelegate mReaderForAccessibilityDelegate;
-     private double mPageZoomLatestDefaultZoomPrefValue;
-     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
-+    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
- 
-     private FontSizePrefs mFontSizePrefs;
-     private FontSizePrefsObserver mFontSizePrefsObserver =
-@@ -149,6 +151,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-         mMoveToolbarToBottomPref.setChecked(mMoveTopToolbarToBottomDelegate.isEnabled());
-         mMoveToolbarToBottomPref.setOnPreferenceChangeListener(this);
- 
-+        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
-+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
-+        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
-+        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.isEnabled());
-+        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -226,6 +234,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-         } else if (PREF_MOVE_TOOLBAR_TO_BOTTOM.equals(preference.getKey())) {
-             mMoveTopToolbarToBottomDelegate.setEnabled((Boolean) newValue);
-             mDelegate.requestRestart(getActivity());
-+        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
-+            mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue);
-+            mDelegate.requestRestart(getActivity());
-         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
-             // TODO(mschillaci): Implement the override behavior for OS level.
-         }
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -43,6 +43,8 @@ public interface AccessibilitySettingsDelegate {
- 
+@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate {
      BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate();
+     BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate();
  
 +    BooleanPreferenceDelegate getShowAlwaysContextMenuOnLinksDelegate();
 +
      /** @return The BrowserContextHandle that should be used to read and update settings. */
      BrowserContextHandle getBrowserContextHandle();
  
+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
+@@ -9,6 +9,7 @@ import android.net.Uri;
+ import androidx.annotation.IntDef;
+ 
+ import org.chromium.content_public.browser.WebContents;
++import org.chromium.content_public.common.Referrer;
+ import org.chromium.url.GURL;
+ 
+ import java.lang.annotation.Retention;
+@@ -148,6 +149,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
@@ -320,15 +344,15 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
 --- a/third_party/blink/renderer/core/html/html_anchor_element.cc
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
-@@ -59,6 +59,7 @@
- #include "third_party/blink/renderer/core/loader/ping_loader.h"
+@@ -63,6 +63,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/speculation_rules/document_speculation_rules.h"
  #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -467,6 +468,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+@@ -519,6 +520,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
                                              bool is_trusted,
                                              base::TimeTicks platform_time_stamp,
                                              KURL completed_url) {
@@ -346,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;
-@@ -527,6 +539,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
-             /*element=*/this, request.HasUserGesture()));
+@@ -585,6 +597,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+             request.GetReferrerPolicy()));
    }
  
 +  if (!do_not_show_context_menu &&
@@ -362,16 +386,16 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    Frame* target_frame =
        frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
  
-@@ -559,7 +580,7 @@ void HTMLAnchorElement::SetHovered(bool hovered) {
-   HTMLElement::SetHovered(hovered);
+@@ -639,7 +660,7 @@ AtomicString HTMLAnchorElement::interestAction() const {
+   return g_empty_atom;
  }
  
--void HTMLAnchorElement::HandleClick(Event& event) {
-+void HTMLAnchorElement::HandleClick(Event& event, bool do_not_show_context_menu) {
+-void HTMLAnchorElement::HandleClick(MouseEvent& event) {
++void HTMLAnchorElement::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
    event.SetDefaultHandled();
  
    LocalDOMWindow* window = GetDocument().domWindow();
-@@ -656,13 +677,12 @@ void HTMLAnchorElement::HandleClick(Event& event) {
+@@ -735,13 +756,12 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
      return;
    }
  
@@ -389,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
      // We distinguish single/double click with some modifiers.
      // See the comment of `EventHandler.delayed_navigation_task_handle_`.
      auto task_handle = PostDelayedCancellableTask(
-@@ -672,7 +692,9 @@ void HTMLAnchorElement::HandleClick(Event& event) {
+@@ -751,7 +771,9 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
      frame->GetEventHandler().SetDelayedNavigationTaskHandle(
          std::move(task_handle));
    } else {
@@ -403,37 +427,31 @@ 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
-@@ -106,6 +106,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
-   void SetHovered(bool hovered) override;
+@@ -116,6 +116,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+   AtomicString interestAction() const override;
  
    void Trace(Visitor*) const override;
-+  void HandleClick(Event&, bool do_not_show_context_menu = false);
++  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
  
   protected:
    void ParseAttribute(const AttributeModificationParams&) override;
-@@ -130,12 +131,16 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
-   bool IsInteractiveContent() const final;
-   InsertionNotificationRequest InsertedInto(ContainerNode&) override;
-   void RemovedFrom(ContainerNode&) override;
-+  void NavigateToHyperlink2(ResourceRequest,
+@@ -147,7 +148,11 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+                            bool is_trusted,
+                            base::TimeTicks platform_time_stamp,
+                            KURL);
+-  void HandleClick(MouseEvent&);
++ void NavigateToHyperlink2(ResourceRequest,
 +                           NavigationPolicy,
 +                           bool is_trusted,
 +                           base::TimeTicks platform_time_stamp,
 +                           KURL, Event&, bool do_not_show_context_menu);
-   void NavigateToHyperlink(ResourceRequest,
-                            NavigationPolicy,
-                            bool is_trusted,
-                            base::TimeTicks platform_time_stamp,
--                           KURL);
--  void HandleClick(Event&);
-+                           KURL completed_url);
  
    unsigned link_relations_ : 31;
    mutable LinkHash cached_visited_link_hash_;
 diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
 --- a/third_party/blink/renderer/core/html/html_image_element.cc
 +++ b/third_party/blink/renderer/core/html/html_image_element.cc
-@@ -37,6 +37,7 @@
+@@ -36,6 +36,7 @@
  #include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h"
  #include "third_party/blink/renderer/core/dom/node_traversal.h"
  #include "third_party/blink/renderer/core/dom/shadow_root.h"
@@ -441,7 +459,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/frame/attribution_src_loader.h"
  #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h"
  #include "third_party/blink/renderer/core/frame/local_dom_window.h"
-@@ -65,6 +66,7 @@
+@@ -63,6 +64,7 @@
  #include "third_party/blink/renderer/core/media_type_names.h"
  #include "third_party/blink/renderer/core/page/chrome_client.h"
  #include "third_party/blink/renderer/core/page/page.h"
@@ -449,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"
-@@ -803,6 +805,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -799,6 +801,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
    }
  }
  
@@ -474,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
+@@ -222,6 +222,8 @@ class CORE_EXPORT HTMLImageElement
    void DidAddUserAgentShadowRoot(ShadowRoot&) override;
    void AdjustStyle(ComputedStyleBuilder&) override;
  
@@ -486,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
-@@ -225,14 +225,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -231,14 +231,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
    }
  }
  
@@ -506,7 +524,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
      mouse_event->SetDefaultHandled();
  }
  
-@@ -450,7 +452,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -456,7 +458,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
  bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                              const PhysicalOffset& point,
                                              WebMenuSourceType source_type,
@@ -516,14 +534,15 @@ 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,
-@@ -473,6 +476,15 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -479,6 +482,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())) {
-+      Event event;
++      MouseEvent& event = *MouseEvent::Create();
++      event.SetTarget(mouse_event->target());
 +      anchor_element->HandleClick(event, /*do_not_show_context_menu*/true);
 +      return true;
 +    }
@@ -532,7 +551,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Clear any previously set cached results if we are resetting the hit test
    // result.
    image_selection_cached_result_ = nullptr;
-@@ -831,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -831,11 +844,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
    SetAutofillData(result.InnerNode(), data);
    SetPasswordManagerData(result.InnerElement(), data);
  

build/patches/Add-site-engagement-flag.patch

@@ -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
-@@ -153,6 +153,7 @@
- #include "components/send_tab_to_self/features.h"
+@@ -160,6 +160,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
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,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"
-@@ -387,6 +388,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -350,6 +351,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;
  
-@@ -401,6 +406,10 @@ std::vector<ImportantDomainInfo>
+@@ -364,6 +369,10 @@ std::vector<ImportantDomainInfo>
  ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
                                                      size_t max_results) {
    SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime");
@@ -68,15 +68,15 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
 diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc
 --- a/components/feature_engagement/internal/tracker_impl.cc
 +++ b/components/feature_engagement/internal/tracker_impl.cc
-@@ -23,6 +23,7 @@
- #include "base/task/single_thread_task_runner.h"
+@@ -24,6 +24,7 @@
  #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"
-@@ -211,6 +212,8 @@ TrackerImpl::TrackerImpl(
+@@ -212,6 +213,8 @@ TrackerImpl::TrackerImpl(
  TrackerImpl::~TrackerImpl() = default;
  
  void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -96,23 +96,23 @@ 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"
-@@ -111,6 +112,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -112,6 +113,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
    }
  
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +  if (!base::FeatureList::IsEnabled(site_engagement::features::kSiteEngagement)) {
-+    absl::optional<FeatureConfig> config = FeatureConfig();
++    std::optional<FeatureConfig> config = FeatureConfig();
 +    config->valid = false;
 +    return config;
 +  }
 +
  #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 @@
+@@ -23,6 +23,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() {
+@@ -280,6 +281,10 @@ void SiteEngagementScore::Commit() {
    if (!UpdateScoreDict(*score_dict_))
      return;
  

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

@@ -12,15 +12,15 @@ 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
-@@ -86,6 +86,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
+@@ -96,6 +96,7 @@ import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
+ 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;
 +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;
-@@ -457,8 +458,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -510,8 +511,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              finish();
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {

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

@@ -9,14 +9,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  base/android/content_uri_utils.cc             | 10 ++++++
  base/android/content_uri_utils.h              |  4 +++
- .../org/chromium/base/ContentUriUtils.java    | 33 +++++++++++++++++++
- 3 files changed, 47 insertions(+)
+ .../org/chromium/base/ContentUriUtils.java    | 34 +++++++++++++++++++
+ 3 files changed, 48 insertions(+)
 
 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);
+@@ -68,6 +68,16 @@ int64_t GetContentUriFileSize(const FilePath& content_uri) {
+   return Java_ContentUriUtils_getContentUriFileSize(env, j_uri);
  }
  
 +File OpenContentUriForWrite(const FilePath& content_uri) {
@@ -35,21 +35,29 @@ diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.
 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);
+@@ -27,6 +27,10 @@ BASE_EXPORT std::optional<std::string> TranslateOpenFlagsToJavaMode(
+ BASE_EXPORT File OpenContentUri(const FilePath& content_uri,
+                                 uint32_t open_flags);
  
 +// 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);
+ // Gets file size, or -1 if file is unknown length.
+ BASE_EXPORT int64_t GetContentUriFileSize(const FilePath& content_uri);
  
 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;
+@@ -10,6 +10,7 @@ import android.content.res.AssetFileDescriptor;
+ import android.database.Cursor;
+ import android.net.Uri;
+ import android.os.Build;
++import android.os.ParcelFileDescriptor;
+ import android.provider.DocumentsContract;
+ import android.provider.MediaStore;
+ import android.text.TextUtils;
+@@ -22,6 +23,9 @@ import org.jni_zero.CalledByNative;
  import java.io.File;
  import java.io.IOException;
  
@@ -59,7 +67,7 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
  /** This class provides methods to access content URI schemes. */
  public abstract class ContentUriUtils {
      private static final String TAG = "ContentUriUtils";
-@@ -87,6 +90,36 @@ public abstract class ContentUriUtils {
+@@ -89,6 +93,36 @@ public abstract class ContentUriUtils {
          return -1;
      }
  

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

@@ -36,7 +36,7 @@ Enabled by default
  .../platform/graphics/bitmap_image_metrics.h  |   4 +-
  .../renderer/platform/image-decoders/BUILD.gn |   9 +
  .../platform/image-decoders/image_decoder.cc  |  23 +
- .../image-decoders/jxl/jxl_image_decoder.cc   | 683 ++++++++++++++++++
+ .../image-decoders/jxl/jxl_image_decoder.cc   | 686 ++++++++++++++++++
  .../image-decoders/jxl/jxl_image_decoder.h    | 123 ++++
  .../jxl/jxl_image_decoder_test.cc             | 626 ++++++++++++++++
  .../blink/tools/commit_stats/git-dirs.txt     |   1 +
@@ -58,7 +58,7 @@ Enabled by default
  .../libjxl/gen_headers/jxl/jxl_export.h       |  11 +
  tools/metrics/histograms/enums.xml            |   1 +
  .../histograms/metadata/blink/enums.xml       |   2 +-
- 53 files changed, 1995 insertions(+), 17 deletions(-)
+ 53 files changed, 1998 insertions(+), 17 deletions(-)
  create mode 100644 build/linux/unbundle/libjxl.gn
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc
@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -489,6 +489,10 @@ vars = {
+@@ -498,6 +498,10 @@ vars = {
    # Three lines of non-changing comments so that
    # the commit queue can handle CLs rolling feed
    # and whatever else without interference from each other.
@@ -92,10 +92,10 @@ diff --git a/DEPS b/DEPS
 +  # Three lines of non-changing comments so that
 +  # the commit queue can handle CLs rolling feed
 +  # and whatever else without interference from each other.
-   'highway_revision': '8f20644eca693cfb74aa795b0006b6779c370e7a',
+   'highway_revision': '8295336dd70f1201d42c22ab5b0861de38cf8fbf',
    # Three lines of non-changing comments so that
    # the commit queue can handle CLs rolling ffmpeg
-@@ -1107,6 +1111,9 @@ deps = {
+@@ -1664,6 +1668,9 @@ deps = {
    'src/third_party/dawn':
      Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
  
@@ -147,14 +147,14 @@ new file mode 100644
 diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/replace_gn_files.py
 --- a/build/linux/unbundle/replace_gn_files.py
 +++ b/build/linux/unbundle/replace_gn_files.py
-@@ -55,6 +55,7 @@ REPLACEMENTS = {
-   'libdrm': 'third_party/libdrm/BUILD.gn',
-   'libevent': 'third_party/libevent/BUILD.gn',
-   'libjpeg': 'third_party/libjpeg.gni',
-+  'libjxl' : 'third_party/libjxl/BUILD.gn',
-   'libpng': 'third_party/libpng/BUILD.gn',
-   'libsecret' : 'third_party/libsecret/BUILD.gn',
-   'libusb': 'third_party/libusb/BUILD.gn',
+@@ -57,6 +57,7 @@ REPLACEMENTS = {
+     'libdrm': 'third_party/libdrm/BUILD.gn',
+     'libevent': 'third_party/libevent/BUILD.gn',
+     'libjpeg': 'third_party/libjpeg.gni',
++    'libjxl' : 'third_party/libjxl/BUILD.gn',
+     'libpng': 'third_party/libpng/BUILD.gn',
+     'libsecret': 'third_party/libsecret/BUILD.gn',
+     'libusb': 'third_party/libusb/BUILD.gn',
 diff --git a/cc/base/devtools_instrumentation.cc b/cc/base/devtools_instrumentation.cc
 --- a/cc/base/devtools_instrumentation.cc
 +++ b/cc/base/devtools_instrumentation.cc
@@ -171,7 +171,7 @@ diff --git a/cc/base/devtools_instrumentation.cc b/cc/base/devtools_instrumentat
 diff --git a/cc/base/devtools_instrumentation.h b/cc/base/devtools_instrumentation.h
 --- a/cc/base/devtools_instrumentation.h
 +++ b/cc/base/devtools_instrumentation.h
-@@ -72,7 +72,7 @@ class CC_BASE_EXPORT ScopedLayerTask {
+@@ -71,7 +71,7 @@ class CC_BASE_EXPORT ScopedLayerTask {
  
  class CC_BASE_EXPORT ScopedImageTask {
   public:
@@ -190,8 +190,8 @@ diff --git a/cc/paint/paint_image.h b/cc/paint/paint_image.h
 -enum class ImageType { kPNG, kJPEG, kWEBP, kGIF, kICO, kBMP, kAVIF, kInvalid };
 +enum class ImageType { kPNG, kJPEG, kWEBP, kGIF, kICO, kBMP, kAVIF, kJXL, kInvalid };
  
- enum class AuxImage : size_t { kDefault = 0, kGainmap = 1 };
- static constexpr std::array<AuxImage, 2> kAllAuxImages = {AuxImage::kDefault,
+ // An encoded image may include several auxiliary images within it. This enum
+ // is used to index those images. Auxiliary images can have different sizes and
 diff --git a/cc/tiles/image_decode_cache.h b/cc/tiles/image_decode_cache.h
 --- a/cc/tiles/image_decode_cache.h
 +++ b/cc/tiles/image_decode_cache.h
@@ -329,7 +329,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
 +++ b/net/base/mime_util.cc
-@@ -164,6 +164,7 @@ static const MimeInfo kPrimaryMappings[] = {
+@@ -165,6 +165,7 @@ static const MimeInfo kPrimaryMappings[] = {
      {"image/avif", "avif"},
      {"image/gif", "gif"},
      {"image/jpeg", "jpeg,jpg"},
@@ -337,7 +337,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
      {"image/png", "png"},
      {"image/apng", "png,apng"},
      {"image/svg+xml", "svg,svgz"},
-@@ -667,6 +668,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
+@@ -660,6 +661,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
                                                    "image/gif",
                                                    "image/ief",
                                                    "image/jpeg",
@@ -348,7 +348,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 --- a/net/base/mime_util_unittest.cc
 +++ b/net/base/mime_util_unittest.cc
-@@ -39,6 +39,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
+@@ -40,6 +40,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
        {FILE_PATH_LITERAL("webm"), "video/webm"},
        {FILE_PATH_LITERAL("weba"), "audio/webm"},
        {FILE_PATH_LITERAL("avif"), "image/avif"},
@@ -356,7 +356,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
        {FILE_PATH_LITERAL("epub"), "application/epub+zip"},
        {FILE_PATH_LITERAL("apk"), "application/vnd.android.package-archive"},
        {FILE_PATH_LITERAL("cer"), "application/x-x509-ca-cert"},
-@@ -80,6 +81,7 @@ TEST(MimeUtilTest, ExtensionTest) {
+@@ -81,6 +82,7 @@ TEST(MimeUtilTest, ExtensionTest) {
      {FILE_PATH_LITERAL("webm"), {"video/webm"}},
      {FILE_PATH_LITERAL("weba"), {"audio/webm"}},
      {FILE_PATH_LITERAL("avif"), {"image/avif"}},
@@ -364,7 +364,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
  #if BUILDFLAG(IS_CHROMEOS_ASH)
      // These are test cases for testing platform mime types on ChromeOS.
      {FILE_PATH_LITERAL("epub"), {"application/epub+zip"}},
-@@ -496,6 +498,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
+@@ -497,6 +499,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
        {"MeSsAge/*", 1, "eml"},
        {"message/", 0, nullptr, true},
        {"image/avif", 1, "avif"},
@@ -375,7 +375,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 diff --git a/third_party/.gitignore b/third_party/.gitignore
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
-@@ -90,6 +90,7 @@
+@@ -86,6 +86,7 @@
  /libgifcodec
  /libjingle/source
  /libupnp
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -4294,6 +4294,7 @@ domain Emulation
+@@ -4523,6 +4523,7 @@ domain Emulation
    experimental type DisabledImageType extends string
      enum
        avif
@@ -478,7 +478,7 @@ diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/t
 diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
-@@ -502,10 +502,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
+@@ -500,10 +500,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
    String header(network_utils::ImageAcceptHeader());
    for (String type : *disabled_image_types) {
      // The header string is expected to be like
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent
      header.Replace(String(type + ","), "");
    }
    return AtomicString(header);
-@@ -850,6 +850,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
+@@ -848,6 +848,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
    namespace DisabledImageTypeEnum = protocol::Emulation::DisabledImageTypeEnum;
    for (protocol::Emulation::DisabledImageType type : *disabled_types) {
      if (DisabledImageTypeEnum::Avif == type ||
@@ -608,7 +608,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2280,6 +2280,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2369,6 +2369,10 @@ source_set("blink_platform_unittests_sources") {
      sources += [ "text/locale_icu_test.cc" ]
    }
  
@@ -619,10 +619,10 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
    sources += [ "testing/run_all_tests.cc" ]
  
    configs += [
-@@ -2323,6 +2327,7 @@ source_set("blink_platform_unittests_sources") {
-     "//third_party/blink/renderer/platform/scheduler:unit_tests",
+@@ -2415,6 +2419,7 @@ source_set("blink_platform_unittests_sources") {
      "//third_party/blink/renderer/platform/wtf",
-     "//third_party/libavif:libavif",
+     "//third_party/dawn/src/dawn/native",
+     "//third_party/dawn/src/dawn/wire",
 +    "//third_party/libjxl:libjxl",
      "//third_party/libyuv",
      "//third_party/webrtc/api/task_queue:task_queue_test",
@@ -663,7 +663,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.c
 diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h b/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 --- a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 +++ b/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
-@@ -29,8 +29,8 @@ class PLATFORM_EXPORT BitmapImageMetrics {
+@@ -32,8 +32,8 @@ class PLATFORM_EXPORT BitmapImageMetrics {
      kICO = 5,
      kBMP = 6,
      kAVIF = 7,
@@ -677,7 +677,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
-@@ -72,6 +72,15 @@ component("image_decoders") {
+@@ -70,6 +70,15 @@ component("image_decoders") {
      "//third_party/libyuv",
    ]
  
@@ -696,33 +696,26 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third
 diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
-@@ -23,6 +23,7 @@
- #include <memory>
+@@ -29,6 +29,7 @@
  
+ #include "base/containers/heap_array.h"
  #include "base/logging.h"
 +#include "base/feature_list.h"
+ #include "base/numerics/byte_conversions.h"
  #include "base/numerics/safe_conversions.h"
- #include "base/sys_byteorder.h"
  #include "base/trace_event/trace_event.h"
-@@ -30,6 +31,7 @@
- #include "media/media_buildflags.h"
- #include "skia/ext/cicp.h"
- #include "third_party/blink/public/common/buildflags.h"
-+#include "third_party/blink/public/common/features.h"
- #include "third_party/blink/public/platform/platform.h"
- #include "third_party/blink/renderer/platform/image-decoders/bmp/bmp_image_decoder.h"
- #include "third_party/blink/renderer/platform/image-decoders/exif_reader.h"
-@@ -47,6 +49,9 @@
- #include "third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.h"
+@@ -55,6 +56,10 @@
+ #include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.h"
  #endif
  
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +#include "third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.h"
 +#endif
++
  namespace blink {
  
  namespace {
-@@ -74,6 +79,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
+@@ -82,6 +87,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
    if (image_extension == "avif") {
      return cc::ImageType::kAVIF;
    }
@@ -734,7 +727,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  #endif
    return cc::ImageType::kInvalid;
  }
-@@ -191,6 +201,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
+@@ -203,6 +213,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
      return "image/avif";
    }
  #endif
@@ -747,10 +740,10 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  
    return String();
  }
-@@ -296,6 +312,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
-     decoder = std::make_unique<AVIFImageDecoder>(
-         alpha_option, high_bit_depth_decoding_option, color_behavior,
-         max_decoded_bytes, animation_option);
+@@ -318,6 +334,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
+           alpha_option, high_bit_depth_decoding_option, color_behavior,
+           max_decoded_bytes, animation_option);
+     }
 +#endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +  } else if (base::FeatureList::IsEnabled(blink::features::kJXL) &&
@@ -765,7 +758,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_de
 new file mode 100644
 --- /dev/null
 +++ b/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.cc
-@@ -0,0 +1,683 @@
+@@ -0,0 +1,686 @@
 +// Copyright 2021 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -792,9 +785,10 @@ new file mode 100644
 +                                         const skcms_TransferFunction& tf) {
 +  // Override the transfer function with a known parametric curve.
 +  profile.has_trc = true;
++  auto list = base::span(profile.trc);
 +  for (int c = 0; c < 3; c++) {
-+    profile.trc[c].table_entries = 0;
-+    profile.trc[c].parametric = tf;
++    list[c].table_entries = 0;
++    list[c].parametric = tf;
 +  }
 +  return profile;
 +}
@@ -815,11 +809,12 @@ new file mode 100644
 +  // The input ColorProfile owns the buffer memory, make a new copy for
 +  // the newly created one and pass the ownership of the new copy to the new
 +  // color profile.
-+  std::unique_ptr<uint8_t[]> owned_buffer(
-+      new uint8_t[buffer_donor.GetProfile()->size]);
-+  memcpy(owned_buffer.get(), buffer_donor.GetProfile()->buffer,
-+         buffer_donor.GetProfile()->size);
-+  new_profile.buffer = owned_buffer.get();
++  auto owned_buffer = base::HeapArray<uint8_t>::Uninit(buffer_donor.GetProfile()->size);
++  owned_buffer.copy_from(
++    base::span<const uint8_t>(
++      static_cast<const uint8_t*>(buffer_donor.GetProfile()->buffer),
++      buffer_donor.GetProfile()->size));
++  new_profile.buffer = std::move(owned_buffer.data());
 +  return std::make_unique<ColorProfile>(new_profile, std::move(owned_buffer));
 +}
 +}  // namespace
@@ -1144,7 +1139,8 @@ new file mode 100644
 +                                     JXL_COLOR_PROFILE_TARGET_DATA,
 +                                     icc_profile.data(), icc_profile.size())) {
 +            profile =
-+                ColorProfile::Create(icc_profile.data(), icc_profile.size());
++                ColorProfile::Create(
++                  base::span(icc_profile.data(), icc_profile.size()));
 +            have_data_profile = true;
 +
 +            // Detect whether the ICC profile approximately equals PQ or HLG,
@@ -1555,7 +1551,7 @@ new file mode 100644
 +  bool have_color_info_ = false;
 +
 +  // Preserved for JXL pixel callback. Not owned.
-+  ColorProfileTransform* xform_;
++  raw_ptr<ColorProfileTransform> xform_;
 +
 +  // Fields for animation support.
 +
@@ -2222,7 +2218,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
 diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
 --- a/third_party/blink/web_tests/TestExpectations
 +++ b/third_party/blink/web_tests/TestExpectations
-@@ -4559,6 +4559,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -4872,6 +4872,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
  # Started failing after rolling new version of check-layout-th.js
  css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
  
@@ -2238,9 +2234,9 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
 diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
 --- a/third_party/blink/web_tests/VirtualTestSuites
 +++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -102,6 +102,15 @@
-              "--disable-threaded-compositing", "--disable-threaded-animation"],
-     "expires": "Jul 1, 2023"
+@@ -431,6 +431,15 @@
+     "args": ["--enable-blink-features=FractionalScrollOffsets"],
+     "expires": "Jun 1, 2025"
    },
 +  {
 +    "prefix": "jxl-enabled",
@@ -2252,7 +2248,7 @@ diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/w
 +    "expires": "Jul 1, 2023"
 +  },
    {
-     "prefix": "unsafe_webgpu",
+     "prefix": "highdpi-threaded",
      "platforms": ["Linux", "Mac", "Win"],
 diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/emulation/emulation-set-disabled-image-types-jxl-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/emulation/emulation-set-disabled-image-types-jxl-expected.txt
 new file mode 100644
@@ -2653,7 +2649,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -21104,6 +21104,7 @@ from previous Chrome versions.
+@@ -20938,6 +20938,7 @@ from previous Chrome versions.
    <int value="188610022" label="NewMessageListView:enabled"/>
    <int value="189728101" label="FasterLocationReload:disabled"/>
    <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
@@ -2664,7 +2660,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/histograms/metadata/blink/enums.xml
 --- a/tools/metrics/histograms/metadata/blink/enums.xml
 +++ b/tools/metrics/histograms/metadata/blink/enums.xml
-@@ -227,7 +227,7 @@ chromium-metrics-reviews@google.com.
+@@ -214,7 +214,7 @@ chromium-metrics-reviews@google.com.
    <int value="5" label="kImageICO"/>
    <int value="6" label="kImageBMP"/>
    <int value="7" label="kImageAVIF"/>
@@ -2672,5 +2668,5 @@ diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/h
 +  <int value="8" label="kImageJXL"/>
  </enum>
  
- <enum name="FedCmAccountsResponseInvalidReason">
+ <enum name="DigitalIdentityRequestStatus">
 --

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

@@ -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(
+@@ -85,6 +85,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 {
+@@ -117,6 +117,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
-@@ -311,6 +311,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -295,6 +295,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_);
-@@ -584,25 +591,6 @@ static String ExtractWebGLContextCreationError(
+@@ -564,25 +571,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('.');
-@@ -662,6 +650,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -642,6 +630,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
-@@ -1960,6 +1960,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+@@ -1933,6 +1933,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -847,6 +848,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -889,6 +890,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // origin.
        WebRTCIPHandlingPolicy policy =
            GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
@@ -219,7 +219,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
-@@ -287,6 +289,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -282,6 +284,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  
@@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1062,6 +1064,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1013,6 +1015,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  

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

@@ -12,14 +12,21 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 --- a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 +++ b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
-@@ -368,6 +368,13 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -27,6 +27,7 @@
+ #include "third_party/blink/renderer/core/html/media/html_media_element.h"
+ #include "third_party/blink/renderer/core/html/media/html_video_element.h"
+ #include "third_party/blink/renderer/core/layout/layout_video.h"
++#include "third_party/blink/renderer/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"
+@@ -377,6 +378,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;
 +  }
 +

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

@@ -7,24 +7,24 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/net/chrome_report_sender.cc       |  1 +
  .../browser/devtools/protocol/network_handler.cc |  2 ++
  .../cross_origin_embedder_policy_reporter.cc     |  7 +++++--
- .../cross_origin_opener_policy_reporter.cc       | 16 +++++++---------
  .../browser/network/reporting_service_proxy.cc   |  3 +++
  .../renderer_host/render_frame_host_impl.cc      |  6 ------
+ .../coop/cross_origin_opener_policy_reporter.cc  | 16 +++++++---------
  .../web_package/signed_exchange_reporter.cc      |  2 ++
  ...content_switch_dependent_feature_overrides.cc |  1 +
  .../Allow-building-without-enable_reporting.inc  |  2 ++
  net/base/features.cc                             |  1 +
  net/reporting/reporting_service.cc               |  6 ++++++
- services/network/network_context.h               |  4 ++--
+ services/network/network_context.h               |  6 +++---
  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 +++-
  .../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(-)
+ 20 files changed, 60 insertions(+), 26 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,7 +41,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1400,6 +1400,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1462,6 +1462,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
@@ -49,7 +49,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
  std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
    std::vector<GURL> urls;
    frame_host->ForEachRenderFrameHostWithAction(
-@@ -1413,6 +1414,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1475,6 +1476,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -65,39 +65,81 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
  #include "content/browser/network/cross_origin_embedder_policy_reporter.h"
  
 +#include "net/base/features.h"
- #include "base/strings/string_piece.h"
+ #include <string_view>
+ 
  #include "base/values.h"
- #include "content/public/browser/storage_partition.h"
-@@ -95,8 +96,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
+@@ -96,8 +97,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
  void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-     std::initializer_list<std::pair<base::StringPiece, base::StringPiece>> body,
+     std::initializer_list<std::pair<std::string_view, std::string_view>> body,
      bool report_only) {
 -  const std::optional<std::string>& endpoint =
 -      report_only ? report_only_endpoint_ : endpoint_;
    const char* const disposition = report_only ? "reporting" : "enforce";
    if (observer_) {
      std::vector<blink::mojom::ReportBodyElementPtr> list;
-@@ -111,6 +110,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+@@ -112,6 +111,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
      observer_->Notify(blink::mojom::Report::New(
          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) {
 @@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-           /*user_agent=*/std::nullopt, std::move(body_to_pass));
+           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"
+@@ -175,12 +176,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+                    const std::string& group,
+                    const std::string& type,
+                    base::Value::Dict body) {
++#if BUILDFLAG(ENABLE_REPORTING)
+     auto* rph = RenderProcessHost::FromID(render_process_id_);
+     if (!rph)
+       return;
+     rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
+         type, group, url, reporting_source_, network_anonymization_key_,
+         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
+@@ -14727,12 +14727,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(),
+-      std::move(body));
+ }
+ 
+ void RenderFrameHostImpl::SendCommitNavigation(
+diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
++++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 @@ -18,25 +18,17 @@
  #include "services/network/public/mojom/network_context.mojom.h"
  #include "services/network/public/mojom/source_location.mojom.h"
@@ -133,15 +175,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";
+@@ -64,6 +57,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(
+@@ -235,6 +229,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
      network::mojom::SourceLocationPtr source_location,
      const std::string& reported_window_url,
      const std::string& initial_popup_url) const {
@@ -149,10 +191,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(
+@@ -282,12 +277,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,56 +206,14 @@ 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(
+@@ -295,6 +292,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"
- #include "base/values.h"
-+#include "net/base/features.h"
- #include "content/browser/service_worker/service_worker_host.h"
- #include "content/browser/worker_host/dedicated_worker_host.h"
- #include "content/browser/worker_host/shared_worker_host.h"
-@@ -175,12 +176,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
-                    const std::string& group,
-                    const std::string& type,
-                    base::Value::Dict body) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-     auto* rph = RenderProcessHost::FromID(render_process_id_);
-     if (!rph)
-       return;
-     rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
-         type, group, url, reporting_source_, network_anonymization_key_,
-         /*user_agent=*/std::nullopt, std::move(body));
-+#endif
-   }
- 
-   const int render_process_id_;
-diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
---- a/content/browser/renderer_host/render_frame_host_impl.cc
-+++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -13787,12 +13787,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
-   base::Value::Dict body;
-   if (!reason.empty())
-     body.Set("reason", reason);
--
--  // Send the crash report to the Reporting API.
--  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
--      /*type=*/"crash", /*group=*/"default", last_committed_url_,
--      GetReportingSource(), isolation_info_.network_anonymization_key(),
--      std::nullopt /* user_agent */, std::move(body));
- }
- 
- void RenderFrameHostImpl::SendCommitNavigation(
 diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
@@ -254,7 +254,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -229,6 +229,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
+@@ -217,6 +217,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
      base::Seconds(30));
  
  #if BUILDFLAG(ENABLE_REPORTING)
@@ -265,10 +265,10 @@ diff --git a/net/base/features.cc b/net/base/features.cc
 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,
+@@ -225,6 +225,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;
@@ -276,17 +276,22 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 +#error Attempting to build with enable_reporting
 +#endif
      DCHECK(initialized_);
-     context_->cache()->AddReport(
-         reporting_source, network_anonymization_key, sanitized_url, user_agent,
+     context_->cache()->AddReport(reporting_source, network_anonymization_key,
+                                  sanitized_url, user_agent, group, type,
 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
+@@ -467,14 +467,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;
@@ -297,7 +302,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1443,7 +1443,6 @@ mojom("mojom") {
+@@ -1486,7 +1486,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 +313,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
-@@ -1206,6 +1206,7 @@ interface NetworkContext {
-   // provided |network_isolation_key|.
+@@ -1257,6 +1257,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,
-@@ -1219,6 +1220,7 @@ interface NetworkContext {
+@@ -1264,6 +1265,7 @@ interface NetworkContext {
+               NetworkAnonymizationKey network_anonymization_key,
+               mojo_base.mojom.DictionaryValue body);
+ 
++  [EnableIf=enable_reporting]
+   QueueEnterpriseReport(string type,
+               string group,
+               url.mojom.Url url,
+@@ -1274,6 +1276,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);
@@ -335,7 +348,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/ranges/algorithm.h"
-@@ -1167,6 +1168,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1239,6 +1240,7 @@ void ContentSecurityPolicy::ReportViolation(
      return;
    }
  
@@ -343,7 +356,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
    PostViolationReport(violation_data, context_frame, report_endpoints,
                        use_reporting_api);
  
-@@ -1174,6 +1176,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1246,6 +1248,7 @@ void ContentSecurityPolicy::ReportViolation(
    // `context_frame` (i.e. we're not processing 'frame-ancestors').
    if (delegate_ && !context_frame)
      delegate_->DispatchViolationEvent(*violation_data, element);
@@ -362,8 +375,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"
-@@ -2619,9 +2620,11 @@ void LocalFrame::MainFrameInteractive() {
-   v8_local_compile_hints_producer_->GenerateData();
+@@ -2771,9 +2772,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
+   v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
  }
  
 +#if BUILDFLAG(ENABLE_REPORTING)
@@ -385,7 +398,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -657,8 +658,9 @@ class CORE_EXPORT LocalFrame final
+@@ -658,8 +659,9 @@ class CORE_EXPORT LocalFrame final
    void FinishedScrollSequence();
  
    SmoothScrollSequencer* GetSmoothScrollSequencer() const;
@@ -404,7 +417,7 @@ 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";

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

@@ -4,288 +4,240 @@ 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 -
- chrome/android/chrome_java_sources.gni                      | 1 -
- .../chrome/browser/feed/FeedSurfaceCoordinator.java         | 5 +----
- chrome/browser/BUILD.gn                                     | 6 ------
- .../browser/extensions/api/settings_private/prefs_util.cc   | 2 ++
- chrome/browser/profiles/profile_impl.cc                     | 4 ++++
- chrome/browser/profiles/profile_manager.cc                  | 4 ++++
- chrome/browser/ui/webui/managed_ui_handler.cc               | 2 ++
- chrome/browser/ui/webui/management/management_ui_handler.cc | 2 ++
- components/supervised_user/buildflags.gni                   | 6 +-----
- .../core/browser/supervised_user_preferences.cc             | 2 +-
- .../supervised_user/core/browser/supervised_user_utils.cc   | 4 ++++
- components/supervised_user/core/common/features.cc          | 1 +
- components/supervised_user/core/common/pref_names.h         | 4 ++++
- .../core/common/supervised_user_constants.cc                | 2 ++
- 15 files changed, 28 insertions(+), 18 deletions(-)
+ 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 -------
+ 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                | 5 +----
+ .../supervised_user/core/browser/supervised_user_utils.cc  | 1 +
+ components/supervised_user/core/common/features.cc         | 6 ++++++
+ 14 files changed, 17 insertions(+), 30 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -3697,7 +3697,6 @@ generate_jni("chrome_jni_headers") {
-     "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
-     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
-     "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java",
--    "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java",
-     "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
-     "java/src/org/chromium/chrome/browser/tab/TabBrowserControlsConstraintsHelper.java",
-     "java/src/org/chromium/chrome/browser/tab/TabFavicon.java",
-diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
---- a/chrome/android/chrome_java_sources.gni
-+++ b/chrome/android/chrome_java_sources.gni
-@@ -1085,7 +1085,6 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/suggestions/tile/TileGroupDelegateImpl.java",
-   "java/src/org/chromium/chrome/browser/suggestions/tile/TileRenderer.java",
-   "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java",
--  "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java",
-   "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
-   "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
-   "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
-diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
---- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
-+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
-@@ -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;
-@@ -775,9 +774,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;
-     }
+@@ -783,7 +783,6 @@ if (current_toolchain == default_toolchain) {
+       "//components/offline_pages/core:offline_page_model_enums_java",
+       "//components/sharing_message:sharing_dialog_type_generated_enum",
+       "//components/sharing_message:sharing_send_message_result_generated_enum",
+-      "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
+     ]
  
-     /**
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -3165,8 +3165,6 @@ static_library("browser") {
-       "feed/android/refresh_task_scheduler_impl.cc",
-       "feed/android/refresh_task_scheduler_impl.h",
-       "feed/android/web_feed_bridge.cc",
--      "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",
-@@ -3371,10 +3369,6 @@ static_library("browser") {
-       "ssl/chrome_security_state_model_delegate.h",
-       "ssl/known_interception_disclosure_infobar.cc",
-       "ssl/known_interception_disclosure_infobar.h",
--      "supervised_user/android/favicon_fetcher.cc",
--      "supervised_user/android/favicon_fetcher.h",
--      "supervised_user/android/supervised_user_web_content_handler_impl.cc",
--      "supervised_user/android/supervised_user_web_content_handler_impl.h",
-       "sync/glue/synced_tab_delegate_android.cc",
-       "sync/glue/synced_tab_delegate_android.h",
-       "sync/glue/synced_window_delegate_android.cc",
-diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
---- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
-+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -1024,9 +1024,11 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
-       settings_api::PrefType::kBoolean;
- #endif
+     # 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
+@@ -91,7 +91,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));
+         }
  
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   // Supervised Users.  This setting is queried in our Tast tests (b/241943380).
-   (*s_allowlist)[::prefs::kSupervisedUserExtensionsMayRequestPermissions] =
-       settings_api::PrefType::kBoolean;
-+#endif
+         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")
  
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   (*s_allowlist)[::prefs::kUseAshProxy] = settings_api::PrefType::kBoolean;
+ 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",
+   ]
+@@ -55,7 +54,6 @@ android_library("java") {
+   sources = [
+     "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/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/IMEFeedbackSource.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
+@@ -337,7 +337,7 @@ void PrepareFactory(
+     policy::BrowserPolicyConnector* policy_connector) {
+   factory->SetManagedPolicies(policy_service, policy_connector);
+   factory->SetRecommendedPolicies(policy_service, policy_connector);
+-  if (supervised_user_settings) {
++  if (((false)) && supervised_user_settings) {
+     scoped_refptr<PrefStore> supervised_user_prefs =
+         base::MakeRefCounted<SupervisedUserPrefStore>(supervised_user_settings);
+     DCHECK(async || supervised_user_prefs->IsInitializationComplete());
+diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
+--- a/chrome/browser/profiles/profile_attributes_entry.cc
++++ b/chrome/browser/profiles/profile_attributes_entry.cc
+@@ -454,7 +454,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+ }
+ 
+ std::string ProfileAttributesEntry::GetSupervisedUserId() const {
+-  return GetString(kSupervisedUserId);
++  return "";
+ }
+ 
+ bool ProfileAttributesEntry::IsEphemeral() const {
 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
-@@ -689,10 +689,12 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -694,10 +694,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
      prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
  
    pref_change_registrar_.Init(prefs);
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   pref_change_registrar_.Add(
-       prefs::kSupervisedUserId,
-       base::BindRepeating(&ProfileImpl::UpdateSupervisedUserIdInStorage,
-                           base::Unretained(this)));
-+#endif
+-  pref_change_registrar_.Add(
+-      prefs::kSupervisedUserId,
+-      base::BindRepeating(&ProfileImpl::UpdateSupervisedUserIdInStorage,
+-                          base::Unretained(this)));
  
    // Changes in the profile avatar.
    pref_change_registrar_.Add(
-@@ -1627,11 +1629,13 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1631,6 +1627,7 @@ GURL ProfileImpl::GetHomePage() {
  }
  
  void ProfileImpl::UpdateSupervisedUserIdInStorage() {
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
++  if ((true)) return;
    ProfileManager* profile_manager = g_browser_process->profile_manager();
    ProfileAttributesEntry* entry = profile_manager->GetProfileAttributesStorage()
                                        .GetProfileAttributesWithPath(GetPath());
-   if (entry)
-     entry->SetSupervisedUserId(GetPrefs()->GetString(prefs::kSupervisedUserId));
-+#endif
- }
- 
- void ProfileImpl::UpdateNameInStorage() {
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1215,6 +1215,7 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1213,10 +1213,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
      profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
    }
  
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-   bool force_supervised_user_id =
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1236,6 +1237,7 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
-     profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
-                                    supervised_user_id);
-   }
-+#endif
+-  if (!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);
-@@ -2035,8 +2037,10 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -2029,9 +2025,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   init_params.supervised_user_id =
-       profile->GetPrefs()->GetString(prefs::kSupervisedUserId);
-+#endif
- 
+-  init_params.supervised_user_id =
+-      profile->GetPrefs()->GetString(prefs::kSupervisedUserId);
+-
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    user_manager::User* user =
+       ash::ProfileHelper::Get()->GetUserByProfile(profile);
 diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc
 --- a/chrome/browser/ui/webui/managed_ui_handler.cc
 +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
-@@ -90,9 +90,11 @@ void ManagedUIHandler::AddObservers() {
+@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() {
+     auto domain = static_cast<policy::PolicyDomain>(i);
      policy_service->AddObserver(domain, this);
    }
- 
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   pref_registrar_.Add(prefs::kSupervisedUserId,
-                       base::BindRepeating(&ManagedUIHandler::NotifyIfChanged,
-                                           base::Unretained(this)));
-+#endif
+-
+-  pref_registrar_.Add(prefs::kSupervisedUserId,
+-                      base::BindRepeating(&ManagedUIHandler::NotifyIfChanged,
+-                                          base::Unretained(this)));
  }
  
  void ManagedUIHandler::RemoveObservers() {
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -1507,10 +1507,12 @@ void ManagementUIHandler::AddObservers() {
+@@ -557,10 +557,6 @@ bool ManagementUIHandler::managed() const {
  
-   pref_registrar_.Init(profile->GetPrefs());
- 
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   pref_registrar_.Add(
-       prefs::kSupervisedUserId,
-       base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
-                           base::Unretained(this)));
-+#endif
- 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-   pref_registrar_.Add(
-diff --git a/components/supervised_user/buildflags.gni b/components/supervised_user/buildflags.gni
---- a/components/supervised_user/buildflags.gni
-+++ b/components/supervised_user/buildflags.gni
-@@ -4,9 +4,5 @@
- 
- declare_args() {
-   # Enables supervision for Family Link users.
--  enable_supervised_users =
--      # Platforms which fully support supervision features:
--      is_android || is_chromeos ||
--      # Platforms for which support is currently in development:
--      is_ios || is_linux || is_mac || is_win
-+  enable_supervised_users = false
+ void ManagementUIHandler::RegisterPrefChange(
+     PrefChangeRegistrar& pref_registrar) {
+-  pref_registrar_.Add(
+-      prefs::kSupervisedUserId,
+-      base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
+-                          base::Unretained(this)));
  }
+ 
+ void ManagementUIHandler::UpdateManagedState() {
+diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.cc b/components/supervised_user/core/browser/supervised_user_pref_store.cc
+--- a/components/supervised_user/core/browser/supervised_user_pref_store.cc
++++ b/components/supervised_user/core/browser/supervised_user_pref_store.cc
+@@ -126,6 +126,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() {}
+ 
+ void SupervisedUserPrefStore::OnNewSettingsAvailable(
+     const base::Value::Dict& settings) {
++  if ((true)) return;
+   std::unique_ptr<PrefValueMap> old_prefs = std::move(prefs_);
+   prefs_ = std::make_unique<PrefValueMap>();
+   if (!settings.empty()) {
 diff --git a/components/supervised_user/core/browser/supervised_user_preferences.cc b/components/supervised_user/core/browser/supervised_user_preferences.cc
 --- a/components/supervised_user/core/browser/supervised_user_preferences.cc
 +++ b/components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -173,7 +173,7 @@ bool IsChildAccountStatusKnown(const PrefService& pref_service) {
+@@ -158,6 +158,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
  }
  
- bool IsChildAccount(const PrefService& pref_service) {
+ void EnableParentalControls(PrefService& pref_service) {
++  if ((true)) {
++    DisableParentalControls(pref_service);
++    return;
++  }
+   pref_service.SetString(prefs::kSupervisedUserId,
+                          supervised_user::kChildAccountSUID);
+   SetIsChildAccountStatusKnown(pref_service);
+@@ -180,7 +184,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
+ }
+ 
+ bool IsSubjectToParentalControls(const PrefService& pref_service) {
 -  return pref_service.GetString(prefs::kSupervisedUserId) == kChildAccountSUID;
 +  return false;
  }
  
- bool IsSafeSitesEnabled(const PrefService& pref_service) {
+ }  // namespace supervised_user
+diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
+--- a/components/supervised_user/core/browser/supervised_user_service.cc
++++ b/components/supervised_user/core/browser/supervised_user_service.cc
+@@ -48,10 +48,6 @@ void SupervisedUserService::Init() {
+   DCHECK(settings_service_->IsReady());
+ 
+   pref_change_registrar_.Init(&user_prefs_.get());
+-  pref_change_registrar_.Add(
+-      prefs::kSupervisedUserId,
+-      base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged,
+-                          base::Unretained(this)));
+   FirstTimeInterstitialBannerState banner_state =
+       static_cast<FirstTimeInterstitialBannerState>(
+           user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState));
+@@ -187,6 +183,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState(
+ }
+ 
+ void SupervisedUserService::SetActive(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
-@@ -81,11 +81,15 @@ GURL NormalizeUrl(const GURL& url) {
+@@ -132,6 +132,7 @@ GURL NormalizeUrl(const GURL& url) {
  }
  
  bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
++  if ((true)) return true;
    return pref_service
               .FindPreference(prefs::kDefaultSupervisedUserFilteringBehavior)
               ->IsDefaultValue() ||
-          pref_service.FindPreference(prefs::kSupervisedUserSafeSites)
-              ->IsDefaultValue();
-+#else
-+  return true;
-+#endif
- }
- 
- bool EmitLogRecordHistograms(
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -163,4 +163,5 @@ bool IsShadowKidsApiWithSafeSitesEnabled() {
-   return base::FeatureList::IsEnabled(kShadowKidsApiWithSafeSites);
+@@ -177,4 +177,10 @@ bool IsKidFriendlyContentFeedAvailable() {
+   return base::FeatureList::IsEnabled(kKidFriendlyContentFeed);
  }
  
-+SET_CROMITE_FEATURE_DISABLED(kForceGoogleSafeSearchForSupervisedUsers);
- }  // namespace supervised_user
-diff --git a/components/supervised_user/core/common/pref_names.h b/components/supervised_user/core/common/pref_names.h
---- a/components/supervised_user/core/common/pref_names.h
-+++ b/components/supervised_user/core/common/pref_names.h
-@@ -5,8 +5,10 @@
- #ifndef COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
- #define COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
- 
-+#include "components/supervised_user/core/common/buildflags.h"
- #include "extensions/buildflags/buildflags.h"
- 
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- namespace prefs {
- 
- // A bool pref that keeps whether the child status for this profile was already
-@@ -132,4 +134,6 @@ inline constexpr char kFirstTimeInterstitialBannerState[] =
- 
- }  // namespace prefs
- 
-+#endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-+
- #endif  // COMPONENTS_SUPERVISED_USER_CORE_COMMON_PREF_NAMES_H_
-diff --git a/components/supervised_user/core/common/supervised_user_constants.cc b/components/supervised_user/core/common/supervised_user_constants.cc
---- a/components/supervised_user/core/common/supervised_user_constants.cc
-+++ b/components/supervised_user/core/common/supervised_user_constants.cc
-@@ -70,6 +70,7 @@ const char kChromeOSAvatarIndex[] = "chromeos-avatar-index";
- 
- const char kChromeOSPasswordData[] = "chromeos-password-data";
- 
-+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- const char* const kCustodianInfoPrefs[] = {
-     prefs::kSupervisedUserCustodianName,
-     prefs::kSupervisedUserCustodianEmail,
-@@ -82,6 +83,7 @@ const char* const kCustodianInfoPrefs[] = {
-     prefs::kSupervisedUserSecondCustodianProfileURL,
-     prefs::kSupervisedUserSecondCustodianProfileImageURL,
- };
++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
- 
- const base::FilePath::CharType kSupervisedUserSettingsFilename[] =
-     FILE_PATH_LITERAL("Managed Mode Settings");
++
+ }  // namespace supervised_user
 --

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1181,6 +1181,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1249,6 +1249,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3524,7 +3530,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3656,7 +3662,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
            : HasAudio();
  
    // Audio only stream is allowed to play when in background.
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
-@@ -200,6 +200,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
    bool HasVideo() const override;
    bool HasAudio() const override;
  

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

@@ -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(-)

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

@@ -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(+)
@@ -24,8 +25,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 +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 {
+ import org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter;
+@@ -250,6 +252,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
              Referrer referrer,
              boolean navigateToTab,
              @Nullable AdditionalNavigationParams additionalNavigationParams) {
@@ -33,9 +34,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
          RecordUserAction.record("MobileNewTabOpened");
          RecordUserAction.record("LinkOpenedInNewTab");
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-@@ -235,6 +238,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
- 
-     @Override
+@@ -270,6 +273,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+      * @param url The URL to open.
+      */
      public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
 +        TabBrowserControlsConstraintsHelper.get(mTab).update(BrowserControlsState.SHOWN, true);
          RecordUserAction.record("MobileNewTabOpened");

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

@@ -17,10 +17,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -152,10 +152,6 @@ public class HomepageManager
-      *         tab page if the homepage button is force enabled via flag.
+@@ -155,10 +155,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();
 -        }
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -69,6 +69,7 @@ public class TemplateUrl {
+@@ -72,6 +72,7 @@ public class TemplateUrl {
       *     prepopulated_engines.json.
       */
      public String getNewTabURL() {
@@ -54,14 +54,14 @@ 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(
+@@ -404,6 +404,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(), base::NotFatalUntil::M128);
 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

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

@@ -0,0 +1,64 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Wed, 22 May 2024 07:41:34 +0000
+Subject: Android Toolbar Scroll Ablation setting
+
+Adds a setting for blocking the toolbar hiding
+
+need: Add-cromite-flags-support.patch
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../Toolbar-Scroll-Ablation-flag.grdp                |  9 +++++++++
+ .../java/res/xml/accessibility_preferences.xml       |  6 ++++++
+ .../about_flags_cc/Toolbar-Scroll-Ablation-flag.inc  | 12 ++++++++++++
+ 3 files changed, 27 insertions(+)
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
+
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<grit-part>
++    <message name="IDS_LOCK_TOOLBAR_TITLE" desc="Text for 'Always show toolbar' settings option.">
++        Always show toolbar
++    </message>
++    <message name="IDS_LOCK_TOOLBAR_SUMMARY" desc="Summary text for 'Always show toolbar' settings option.">
++        Blocks the toolbar's hiding
++    </message>
++</grit-part>
+diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
++++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+@@ -73,6 +73,12 @@ found in the LICENSE file.
+         android:key="disable_toolbar_swipeup"
+         android:title="@string/disable_toolbar_swipe_up" />
+ 
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:title="@string/lock_toolbar_title"
++        android:summary="@string/lock_toolbar_summary"
++        app:featureName="android-toolbar-scroll-ablation"
++        app:needRestart="true" />
++
+     <PreferenceCategory
+         android:key="customize_selecton_popup_section"
+         android:title="@string/customize_selecton_popup_title" />
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc
+@@ -0,0 +1,12 @@
++#if BUILDFLAG(IS_ANDROID)
++
++#ifdef FLAG_SECTION
++
++    {"android-toolbar-scroll-ablation",
++     "Android Toolbar Scroll Ablation",
++     "Always shows the toolbar", kOsAndroid,
++     FEATURE_VALUE_TYPE(chrome::android::kAndroidToolbarScrollAblation)},
++
++#endif
++
++#endif
+--

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

@@ -0,0 +1,782 @@
+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/tabmodel/TabWindowManager.java    |   2 +
+ .../tabmodel/TabWindowManagerImpl.java        |  10 ++
+ .../Ask-for-restart-on-connection-change.grdp |  15 +++
+ .../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 +-
+ 29 files changed, 322 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
+@@ -476,7 +476,6 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
+     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+     public void setConnectionState(@ConnectionState int connectionState) {
+         Log.i(TAG, "setConnectionState connectionState=" + connectionState);
+-        if (mConnectionState == connectionState) return;
+         mConnectionState = connectionState;
+         if (mObserver != null) mObserver.onConnectionStateChanged(mConnectionState);
+     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
+@@ -21,16 +21,38 @@ import org.chromium.base.version_info.VersionInfo;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+ import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
+-import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
+-import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
+ import org.chromium.components.variations.VariationsAssociatedData;
+ 
++import android.app.Activity;
++import org.chromium.base.supplier.ObservableSupplier;
++import org.chromium.url.GURL;
++import org.chromium.chrome.R;
++import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
++import org.chromium.chrome.browser.layouts.LayoutManager;
++import org.chromium.chrome.browser.compositor.layouts.Layout;
++import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
++import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
++import org.chromium.chrome.browser.flags.cromite.sAskForRestartOnConnectionChange;
++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
++import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
++import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
++import org.chromium.chrome.browser.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.tabmodel.TabWindowManager;
++import org.chromium.chrome.browser.ApplicationLifetime;
++import org.chromium.content_public.browser.WebContentsObserver;
++import org.chromium.content_public.browser.WebContents;
++import org.chromium.net.NetworkChangeNotifier;
++
+ /**
+  * Class that detects if the network is offline. Waits for the network to stablize before notifying
+  * the observer.
+  */
+ class OfflineDetector
+-        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener {
++        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener,
++                   SnackbarManager.SnackbarController, SceneChangeObserver {
+     // If the connection is online, then we report that immediately via |mIsOfflineCallback|.
+     // |STATUS_INDICATOR_WAIT_ON_OFFLINE_DURATION_MS| and
+     // |mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs| control the duration before
+@@ -116,6 +138,11 @@ class OfflineDetector
+ 
+     private static final String TAG = "OfflineDetector";
+ 
++    private long mLastNetworkId = 0;
++    private ObservableSupplier<TabModelSelector> mTabModelSelectorSupplier;
++    private ObservableSupplier<LayoutManager> mLayoutManager;
++    private Supplier<SnackbarManager> mSnackbarManagerSupplier;
++
+     /**
+      * Constructs the offline indicator.
+      * @param isOfflineCallback The {@link Callback} is invoked when the connectivity status is
+@@ -127,7 +154,13 @@ class OfflineDetector
+     OfflineDetector(
+             Callback<Boolean> isOfflineCallback,
+             Callback<Boolean> isForegroundCallback,
+-            Context context) {
++            Context context,
++            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
++            ObservableSupplier<LayoutManager> layoutManager,
++            Supplier<SnackbarManager> snackbarManagerSupplier) {
++        mTabModelSelectorSupplier = tabModelSelectorSupplier;
++        mSnackbarManagerSupplier = snackbarManagerSupplier;
++        mLayoutManager = layoutManager;
+         mIsOfflineCallback = isOfflineCallback;
+         mIsForegroundCallback = isForegroundCallback;
+         mContext = context;
+@@ -231,6 +264,75 @@ class OfflineDetector
+         updateState();
+     }
+ 
++    private void checkLastNetworkId() {
++        if (!sAskForRestartOnConnectionChange.getInstance().isEnabled())
++            return;
++
++        long currentNetworkId = NetworkChangeNotifier.getInstance().getCurrentDefaultNetId();
++        Log.i(TAG, "onConnectionTypeChanged: currentNetworkId=" + currentNetworkId);
++
++        if (currentNetworkId != -1 && mLastNetworkId != 0
++              && mLastNetworkId != currentNetworkId) {
++            // close snackbar with scene change
++            LayoutManagerImpl layoutManager = (LayoutManagerImpl)mLayoutManager.get();
++            if (layoutManager != null) layoutManager.addSceneChangeObserver(this);
++
++            // close snackbar with reload
++            Tab currentTab = TabModelUtils.getCurrentTab(mTabModelSelectorSupplier.get().getCurrentModel());
++            if (currentTab != null) {
++                WebContents webContents = currentTab.getWebContents();
++                SnackbarManager.SnackbarController controller = this;
++                if (webContents != null) {
++                    new WebContentsObserver(webContents) {
++                        @Override
++                        public void didStartLoading(GURL url) {
++                            webContents.removeObserver(this);
++                            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
++                            snackbarManager.dismissSnackbars(controller);
++                        }
++                    };
++                }
++            }
++
++            // freeze all pages
++            TabWindowManagerSingleton.getInstance().setPagesFrozen(true);
++
++            // show snackbar
++            Snackbar snackbar = Snackbar.make(
++                mContext.getString(R.string.ask_to_restart_on_connection_change_restart),
++                /* snackbarController */ this, Snackbar.TYPE_PERSISTENT, Snackbar.UMA_UNKNOWN)
++                .setSingleLine(false)
++                .setAction(mContext.getString(R.string.relaunch), /*actionData*/0)
++                .setDismissAction(mContext.getString(R.string.ask_to_restart_on_connection_change_close_notification), /*actionData*/1);
++            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
++            if (!snackbarManager.isShowing())
++                snackbarManager.showSnackbar(snackbar);
++        }
++        mLastNetworkId = currentNetworkId;
++    }
++
++    // SnackbarManager.SnackbarController
++    @Override
++    public void onDismissNoAction(Object actionData) {
++        ((LayoutManagerImpl)mLayoutManager.get()).removeSceneChangeObserver(this);
++        TabWindowManagerSingleton.getInstance().setPagesFrozen(false);
++    }
++
++    @Override
++    public void onAction(Object actionData) {
++        if ((int)actionData == 0)
++            ApplicationLifetime.terminate(true);
++    }
++
++    // TabWindowManager.Observer
++    @Override
++    public void onSceneChange(Layout layout) {
++        if (!(layout instanceof HubLayout)) {
++            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
++            snackbarManager.dismissSnackbars(this);
++        }
++    }
++
+     private void logToAdbConsoleNow(String prefix) {
+         Log.i(
+                 TAG,
+@@ -316,6 +418,7 @@ class OfflineDetector
+      ** Calls |mUpdateOfflineStatusIndicatorDelayedRunnable| to update the connection state.
+      */
+     private void updateState() {
++        checkLastNetworkId();
+         mHandler.removeCallbacks(mUpdateOfflineStatusIndicatorDelayedRunnable);
+ 
+         // Do not update state while the app is in background.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
+@@ -28,6 +28,11 @@ import org.chromium.content_public.common.ContentSwitches;
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ 
++import org.chromium.base.supplier.ObservableSupplierImpl;
++import org.chromium.chrome.browser.layouts.LayoutManager;
++import org.chromium.chrome.browser.tabmodel.TabModelSelector;
++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
++
+ /**
+  * Class that controls visibility and content of {@link StatusIndicatorCoordinator} to relay
+  * connectivity information.
+@@ -101,7 +106,10 @@ public class OfflineIndicatorControllerV2 {
+             Context context,
+             StatusIndicatorCoordinator statusIndicator,
+             ObservableSupplier<Boolean> isUrlBarFocusedSupplier,
+-            Supplier<Boolean> canAnimateNativeBrowserControls) {
++            Supplier<Boolean> canAnimateNativeBrowserControls,
++            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
++            ObservableSupplierImpl<LayoutManager> layoutManager,
++            Supplier<SnackbarManager> snackbarManagerSupplier) {
+         if (CommandLine.getInstance()
+                 .hasSwitch(ContentSwitches.FORCE_ONLINE_CONNECTION_STATE_FOR_INDICATOR)) {
+             // If "force online connection state" switch is set, the offline indicator should never
+@@ -129,7 +137,10 @@ public class OfflineIndicatorControllerV2 {
+                     new OfflineDetector(
+                             (Boolean offline) -> onConnectionStateChanged(offline),
+                             (Boolean isForeground) -> onApplicationStateChanged(isForeground),
+-                            mContext);
++                            mContext,
++                            tabModelSelectorSupplier,
++                            layoutManager,
++                            snackbarManagerSupplier);
+         }
+ 
+         // Initializes the application state.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+@@ -1128,7 +1128,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+                         mActivity,
+                         mStatusIndicatorCoordinator,
+                         isUrlBarFocusedSupplier,
+-                        mCanAnimateBrowserControls);
++                        mCanAnimateBrowserControls,
++                        mTabModelSelectorSupplier,
++                        mLayoutManagerSupplier,
++                        mSnackbarManagerSupplier);
+         if (mToolbarManager.getOmniboxStub() != null) {
+             mToolbarManager.getOmniboxStub().addUrlFocusChangeListener(mUrlFocusChangeListener);
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
+@@ -317,6 +317,13 @@ public abstract class TabModelSelectorBase
+         return null;
+     }
+ 
++    @Override
++    public void setPagesFrozen(boolean frozen) {
++        for (int i = 0; i < getModels().size(); i++) {
++            TabModelUtils.setPagesFrozen(mTabModels.get(i), frozen);
++        }
++    }
++
+     @Override
+     public void closeAllTabs() {
+         closeAllTabs(false);
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
+@@ -0,0 +1,32 @@
++/*
++    This file is part of Cromite.
++
++    Cromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Cromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++package org.chromium.chrome.browser.flags.cromite;
++
++import org.chromium.base.cached_flags.CachedFlag;
++import org.chromium.chrome.browser.flags.ChromeFeatureMap;
++
++public class sAskForRestartOnConnectionChange {
++    private static final CachedFlag sInstance =
++        new CachedFlag(ChromeFeatureMap.getInstance(), "AskForRestartOnConnectionChange", false);
++
++    private sAskForRestartOnConnectionChange() {}
++
++    public static CachedFlag getInstance() {
++        return sInstance;
++    }
++}
+diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
+--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
++++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
+@@ -138,6 +138,8 @@ public interface TabModelSelector {
+     /** Close all tabs across all tab models */
+     void closeAllTabs();
+ 
++    void setPagesFrozen(boolean frozen);
++
+     /**
+      * Close all tabs across all tab models
+      * @param uponExit true iff the tabs are being closed upon application exit (after user presses
+diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
+--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
++++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
+@@ -12,10 +12,14 @@ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabSelectionType;
+ import org.chromium.content_public.browser.WebContents;
++import org.chromium.content_public.browser.Visibility;
+ import org.chromium.ui.base.WindowAndroid;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
++import java.util.Collections;
++import java.util.stream.IntStream;
++import java.util.stream.Collectors;
+ 
+ /**
+  * A set of convenience methods used for interacting with {@link TabList}s and {@link TabModel}s.
+@@ -79,6 +83,20 @@ public class TabModelUtils {
+         return TabModel.INVALID_TAB_INDEX;
+     }
+ 
++    public static void setPagesFrozen(TabList model, boolean frozen) {
++        List<Integer> loop = IntStream.range(0, model.getCount())
++                                      .boxed()
++                                      .collect(Collectors.toList());
++        Collections.shuffle(loop);
++        loop.forEach(tabId -> {
++            Tab tab = model.getTabAt(tabId);
++            WebContents webContents = tab.getWebContents();
++            if (webContents != null) {
++                webContents.setPageFrozen(frozen);
++            }
++        });
++    }
++
+     /**
+      * Find the {@link Tab} index whose URL matches the specified URL.
+      *
+diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
+--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
++++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
+@@ -100,6 +100,8 @@ public interface TabWindowManager {
+      */
+     int getIncognitoTabCount();
+ 
++    void setPagesFrozen(boolean frozen);
++
+     /**
+      * @param tab The tab to look for in each model.
+      * @return The TabModel containing the given Tab or null if one doesn't exist.
+diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
+--- a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
++++ b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
+@@ -456,6 +456,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
+         return null;
+     }
+ 
++    @Override
++    public void setPagesFrozen(boolean frozen) {
++        for (int i = 0; i < mSelectors.size(); i++) {
++            TabModelSelector selector = mSelectors.get(i);
++            if (selector != null) {
++                selector.setPagesFrozen(frozen);
++            }
++        }
++    }
++
+     @Override
+     public TabModelSelector getTabModelSelectorById(int index) {
+         return mSelectors.get(index);
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
+@@ -0,0 +1,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/snackbar.xml b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
+--- a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
++++ b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
+@@ -82,5 +82,15 @@ found in the LICENSE file.
+             android:paddingEnd="24dp"
+             android:paddingStart="24dp"
+             style="@style/TextButton" />
++
++        <org.chromium.ui.widget.ButtonCompat
++            android:id="@+id/snackbar_dismiss"
++            android:layout_width="wrap_content"
++            android:layout_height="wrap_content"
++            android:layout_gravity="center_vertical"
++            android:paddingEnd="24dp"
++            android:paddingStart="24dp"
++            android:visibility="gone"
++            style="@style/TextButton" />
+     </LinearLayout>
+ </RelativeLayout>
+diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
+--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
++++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
+@@ -130,6 +130,8 @@ public class Snackbar {
+     private String mTemplateText;
+     private String mActionText;
+     private Object mActionData;
++    private String mDismissActionText;
++    private Object mDismissActionData;
+     private String mAccessibilityActionAnnouncement;
+     private int mBackgroundColor;
+     private int mTextApperanceResId;
+@@ -198,6 +200,20 @@ public class Snackbar {
+         return this;
+     }
+ 
++    public Snackbar setDismissAction(String actionText, Object actionData) {
++        mDismissActionText = actionText;
++        mDismissActionData = actionData;
++        return this;
++    }
++
++    public String getDismissActionText() {
++        return mDismissActionText;
++    }
++
++    Object getDismissActionData() {
++        return mDismissActionData;
++    }
++
+     /**
+      * Sets the text to accessibility announce when the action button is pressed.
+      * @param accessibilityActionAnnouncement An optional string to be announced when the action
+diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
+--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
++++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
+@@ -318,6 +318,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
+@@ -51,6 +51,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;
+@@ -97,11 +98,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);
+     }
+ 
+     /**
+@@ -120,6 +122,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+     public SnackbarView(
+             Activity activity,
+             OnClickListener listener,
++            OnClickListener dismissListener,
+             Snackbar snackbar,
+             ViewGroup parentView,
+             @Nullable WindowAndroid windowAndroid,
+@@ -141,6 +144,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+                 (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
+         mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
+         mActionButtonView.setOnClickListener(listener);
++        mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss);
++        mDismissButtonView.setOnClickListener(dismissListener);
+         mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
+         mEdgeToEdgeSupplier = edgeToEdgeSupplier;
+         mEdgeToEdgePadAdjuster =
+@@ -372,6 +377,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
+@@ -907,6 +907,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
+@@ -199,6 +199,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
+@@ -3554,8 +3554,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
+@@ -1162,6 +1162,12 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+         WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
+     }
+ 
++    @Override
++    public void setPageFrozen(boolean frozen) {
++        if (mNativeWebContentsAndroid == 0) return;
++        WebContentsImplJni.get().setPageFrozen(mNativeWebContentsAndroid, frozen);
++    }
++
+     @Override
+     public void setDisplayCutoutSafeArea(Rect insets) {
+         if (mNativeWebContentsAndroid == 0) return;
+@@ -1448,6 +1454,8 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+ 
+         void setFocus(long nativeWebContentsAndroid, boolean focused);
+ 
++        void setPageFrozen(long nativeWebContentsAndroid, boolean frozen);
++
+         void setDisplayCutoutSafeArea(
+                 long nativeWebContentsAndroid, int top, int left, int bottom, int right);
+ 
+diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
+--- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
++++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
+@@ -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
+@@ -193,6 +193,9 @@ public class MockWebContents implements WebContents {
+     @Override
+     public void setFocus(boolean hasFocus) {}
+ 
++    @Override
++    public void setPageFrozen(boolean frozen) {}
++
+     @Override
+     public boolean isFullscreenForCurrentTab() {
+         return false;
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc b/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
+@@ -0,0 +1,13 @@
++#ifdef FLAG_SECTION
++
++#if BUILDFLAG(IS_ANDROID)
++
++    {"ask-for-restart-on-connection-change",
++     "Restart on connection change",
++     "Asks the user whether to restart the browser when the connection changes.",
++     kOsAndroid,
++     FEATURE_VALUE_TYPE(chrome::android::kAskForRestartOnConnectionChange)},
++
++#endif
++
++#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Ask-for-restart-on-connection-change.inc
+@@ -0,0 +1,3 @@
++CROMITE_FEATURE(kAskForRestartOnConnectionChange,
++                "AskForRestartOnConnectionChange",
++                base::FEATURE_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
+@@ -4319,6 +4319,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
+@@ -3211,6 +3211,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() {
+@@ -3225,6 +3226,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
+@@ -969,7 +969,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+   if (!parent_page_scheduler_)
+     return SchedulingLifecycleState::kNotThrottled;
+   if (parent_page_scheduler_->IsFrozen()) {
++#if !BUILDFLAG(IS_ANDROID)
+     DCHECK(!parent_page_scheduler_->IsPageVisible());
++#endif
+     return SchedulingLifecycleState::kStopped;
+   }
+   if (subresource_loading_paused_ && type == ObserverType::kLoader)
+diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
+--- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
++++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
+@@ -238,10 +238,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
+   // it is desirable to reject the page freeze to prevent the scheduler from
+   // being put in a bad state. See https://crbug.com/873214 for context of how
+   // this can happen on the browser side.
++#if !BUILDFLAG(IS_ANDROID)
+   if (frozen && IsPageVisible()) {
+     DCHECK(false);
+     return;
+   }
++#endif
+   PolicyUpdater policy_updater;
+   SetPageFrozenImpl(frozen, policy_updater);
+ }
+@@ -799,7 +801,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+   // expire immediately when a page is backgrounded, which is undesirable in
+   // headless mode. To prevent that, a page is never considerer backgrounded
+   // when virtual time is enabled.
+-  return !IsPageVisible() && !IsAudioPlaying() &&
++#if BUILDFLAG(IS_ANDROID)
++  bool page_visible = true;
++#else
++  bool page_visible = IsPageVisible();
++#endif
++  return !page_visible && !IsAudioPlaying() &&
+          !main_thread_scheduler_->IsVirtualTimeEnabled();
+ }
+ 
+--

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

@@ -16,7 +16,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../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(-)
+ .../platform/runtime_enabled_features.json5        |  4 ++--
+ 11 files changed, 56 insertions(+), 3 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)
+@@ -201,6 +201,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
    }
  }
  
@@ -87,15 +88,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -11,6 +11,7 @@
- #include "services/metrics/public/cpp/ukm_recorder.h"
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+@@ -12,6 +12,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"
-@@ -586,7 +587,9 @@ double AudioContext::baseLatency() const {
+@@ -592,7 +593,9 @@ double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());
  
@@ -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 {
+@@ -722,6 +723,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -134,11 +135,11 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 +
  void BaseAudioContext::NotifySourceNodeStartedProcessing(AudioNode* node) {
    DCHECK(IsMainThread());
-   GraphAutoLocker locker(this);
+   DeferredTaskHandler::GraphAutoLocker locker(this);
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
-@@ -339,6 +339,8 @@ class MODULES_EXPORT BaseAudioContext
+@@ -341,6 +341,8 @@ class MODULES_EXPORT BaseAudioContext
    // if the execution context does not exist.
    bool CheckExecutionContextAndThrowIfNecessary(ExceptionState&);
  
@@ -150,7 +151,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
 diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
-@@ -368,6 +368,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -369,6 +369,7 @@ void OfflineAudioContext::FireCompletionEvent() {
      if (!rendered_buffer) {
        return;
      }
@@ -161,7 +162,7 @@ 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 @@
+@@ -36,6 +36,7 @@
  #include <bit>
  #include <complex>
  
@@ -169,7 +170,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
  #include "third_party/blink/renderer/platform/audio/audio_bus.h"
  #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
  #include "third_party/blink/renderer/platform/audio/vector_math.h"
-@@ -155,6 +156,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+@@ -160,6 +161,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
            input_buffer[(i + write_index - fft_size + kInputBufferSize) %
                         kInputBufferSize];
  
@@ -177,7 +178,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
        destination[i] = value;
      }
    }
-@@ -182,6 +184,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+@@ -187,6 +189,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
            input_buffer[(i + write_index - fft_size + kInputBufferSize) %
                         kInputBufferSize];
  
@@ -186,7 +187,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
        // Scale from nominal -1 -> +1 to unsigned byte.
        double scaled_value = 128 * (value + 1);
  
-@@ -301,6 +305,8 @@ void RealtimeAnalyser::ConvertToByteData(DOMUint8Array* destination_array) {
+@@ -306,6 +310,8 @@ void RealtimeAnalyser::ConvertToByteData(DOMUint8Array* destination_array) {
        double scaled_value =
            UCHAR_MAX * (db_mag - min_decibels) * range_scale_factor;
  
@@ -195,7 +196,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
        // Clip to valid range.
        destination[i] =
            static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
-@@ -320,6 +326,7 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) {
+@@ -325,6 +331,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);
@@ -203,4 +204,18 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
      }
    }
  }
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -416,8 +416,8 @@
+     {
+       // AudioContext.playoutStats interface.
+       // https://chromestatus.com/feature/5172818344148992
+-      name: "AudioContextPlayoutStats",
+-      status: "experimental",
++      name: "AudioContextPlayoutStats",   // keep AudioContextPlayoutStats
++      status: "experimental",             // experimental
+     },
+     {
+       name: "AudioContextSetSinkId",
 --

build/patches/Battery-API-return-nothing.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -80,46 +80,28 @@ ScriptPromiseTyped<BatteryManager> BatteryManager::StartRequest(
+@@ -80,46 +80,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
  }
  
  bool BatteryManager::charging() {

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

@@ -7,7 +7,7 @@ This approach is not comprehensive, see also:
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../execution_context/execution_context.cc    | 16 ++++++++++
+ .../execution_context/execution_context.cc    | 15 +++++++++
  .../execution_context/execution_context.h     |  1 +
  .../renderer/core/loader/base_fetch_context.h |  1 +
  .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
@@ -19,12 +19,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../websockets/websocket_channel_impl.cc      |  5 +++
  .../modules/websockets/websocket_common.cc    | 30 ++++++++++++++++++
  .../modules/websockets/websocket_common.h     |  4 +++
- 12 files changed, 133 insertions(+), 2 deletions(-)
+ 12 files changed, 132 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -701,6 +701,22 @@ void ExecutionContext::WriteIntoTrace(
+@@ -709,6 +709,21 @@ void ExecutionContext::WriteIntoTrace(
    proto->set_world_type(GetWorldType(*this));
  }
  
@@ -40,8 +40,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 +    case network::mojom::IPAddressSpace::kLocal:
 +      return "local";
 +  }
-+  NOTREACHED();
-+  return "public";
++  NOTREACHED_NORETURN();
 +}
 +
  bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
@@ -50,7 +49,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
-@@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -392,6 +392,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -61,7 +60,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/base_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/base_fetch_context.h
-@@ -86,6 +86,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
+@@ -84,6 +84,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
  
    virtual SubresourceFilter* GetSubresourceFilter() const = 0;
    virtual bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const = 0;
@@ -72,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -593,6 +593,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -885,6 +885,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -102,7 +101,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -177,6 +177,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -172,6 +172,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;
@@ -121,7 +120,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
  #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
  #include "third_party/blink/renderer/platform/scheduler/public/virtual_time_controller.h"
  #include "third_party/blink/renderer/platform/supplementable.h"
-@@ -94,6 +95,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -177,7 +176,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
-@@ -101,6 +101,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
           request_url.ProtocolIsInHTTPFamily();
  }
  
@@ -208,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
  scoped_refptr<BlobDataHandle> ExtractBlobHandle(
      Request* request,
      ExceptionState& exception_state) {
-@@ -188,6 +212,13 @@ ScriptPromise BackgroundFetchManager::fetch(
+@@ -189,6 +213,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
                                   exception_state);
      }
  
@@ -225,7 +224,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) {
+@@ -284,6 +284,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
      return false;
    }
  
@@ -240,7 +239,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
-@@ -125,9 +125,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -136,9 +136,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
      return ConnectResult::kException;
    }
  

build/patches/Block-qjz9zk-or-trk-requests.patch

@@ -18,17 +18,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  net/url_request/trk_protocol_handler.h        | 30 +++++++++++++++++++
  net/url_request/url_request.cc                |  8 +++++
  .../url_request_context_builder.cc            |  3 ++
- url/url_constants.cc                          |  1 +
  url/url_constants.h                           |  1 +
  url/url_util.cc                               |  2 ++
- 14 files changed, 91 insertions(+), 1 deletion(-)
+ 13 files changed, 90 insertions(+), 1 deletion(-)
  create mode 100644 net/url_request/trk_protocol_handler.cc
  create mode 100644 net/url_request/trk_protocol_handler.h
 
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
    if (base::IsStringASCII(scheme) &&
        (ProfileIOData::IsHandledProtocol(scheme) ||
         base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
@@ -50,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) {
+@@ -169,6 +169,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
        continue;
      }
  
@@ -65,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) {
+@@ -97,10 +97,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;
@@ -81,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(
+@@ -597,7 +602,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) ||
@@ -94,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,
+@@ -580,6 +580,10 @@ GURL FixupURLInternal(const std::string& text,
      }
    }
  
@@ -108,7 +107,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -849,6 +849,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -867,6 +867,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
    RegisterPseudoScheme(url::kJavaScriptScheme);
    RegisterPseudoScheme(kViewSourceScheme);
    RegisterPseudoScheme(kGoogleChromeScheme);
@@ -119,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -997,6 +997,8 @@ component("net") {
+@@ -1048,6 +1048,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -196,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"
+@@ -14,6 +14,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 @@
+@@ -51,6 +52,7 @@
  #include "net/url_request/url_request_redirect_job.h"
  #include "url/gurl.h"
  #include "url/origin.h"
@@ -212,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,
+@@ -618,6 +620,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
  
@@ -228,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 @@
+@@ -49,6 +49,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"
@@ -236,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"
-@@ -559,6 +560,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -596,6 +597,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }
@@ -245,32 +244,21 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
    protocol_handlers_.clear();
  
    context->set_job_factory(std::move(job_factory));
-diff --git a/url/url_constants.cc b/url/url_constants.cc
---- a/url/url_constants.cc
-+++ b/url/url_constants.cc
-@@ -29,6 +29,7 @@ const char16_t kDataScheme16[] = u"data";
- const char kFileScheme[] = "file";
- const char16_t kFileScheme16[] = u"file";
- const char kFileSystemScheme[] = "filesystem";
-+const char kTraceScheme[] = "trk";
- const char16_t kFileSystemScheme16[] = u"filesystem";
- const char kFtpScheme[] = "ftp";
- const char16_t kFtpScheme16[] = u"ftp";
 diff --git a/url/url_constants.h b/url/url_constants.h
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
-@@ -33,6 +33,7 @@ COMPONENT_EXPORT(URL) extern const char16_t kContentIDScheme16[];
- COMPONENT_EXPORT(URL) extern const char kDataScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kDataScheme16[];
- COMPONENT_EXPORT(URL) extern const char kFileScheme[];
-+COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kFileScheme16[];
- COMPONENT_EXPORT(URL) extern const char kFileSystemScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kFileSystemScheme16[];
+@@ -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";
+ inline constexpr char kFileSystemScheme[] = "filesystem";
+ inline constexpr char16_t kFileSystemScheme16[] = u"filesystem";
+ inline constexpr char kFtpScheme[] = "ftp";
 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 {
+@@ -53,6 +53,7 @@ struct SchemeRegistry {
    std::vector<SchemeWithType> standard_schemes = {
        {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
        {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -278,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 {
+@@ -98,6 +99,7 @@ struct SchemeRegistry {
        kAboutScheme,
        kJavaScriptScheme,
        kDataScheme,

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

@@ -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
@@ -47,7 +31,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -28,6 +28,8 @@ import java.util.ArrayList;
+@@ -26,6 +26,8 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Function;
  
@@ -56,15 +40,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  /**
   * Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
   * the current context.
-@@ -184,6 +186,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
- 
+@@ -189,12 +191,16 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      void setCurrentFolder(BookmarkId folder) {
          mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
-+        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
+         enableImportExportMenu();
++        enableSelectAllMenu();
+     }
+ 
+     void enableImportExportMenu() {
          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 enableSelectAllMenu() {
++        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
+     }
+ 
+     void setNavigateBackRunnable(Runnable navigateBackRunnable) {
+@@ -221,6 +227,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
              mExportBookmarkRunnable.run();
              return true;
          }
@@ -82,18 +75,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          return mMenuIdClickedFunction.apply(menuItem.getItemId());
      }
  
-@@ -234,6 +248,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -238,6 +255,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
-@@ -248,6 +248,9 @@ CHAR_LIMIT guidelines:
+@@ -246,6 +246,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>

build/patches/Bromite-package-name.patch

@@ -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
-@@ -25,7 +25,7 @@ declare_args() {
+@@ -26,7 +26,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.

build/patches/Bromite-subresource-adblocker.patch

@@ -22,18 +22,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/java/res/xml/main_preferences.xml |   5 +
  .../browser/settings/AdBlockEditor.java       |  91 ++++++
  .../browser/settings/AdBlockPreferences.java  |  58 ++++
- .../chrome/browser/tabmodel/TabModelImpl.java |   2 +-
+ .../chrome/browser/tabmodel/TabModelImpl.java |   4 +-
  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.h         |   2 +
  chrome/browser/chrome_browser_main.cc         |   3 +
- chrome/browser/flags/BUILD.gn                 |   4 +
+ 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 +
@@ -44,15 +44,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../component_updater/download_filters_task.h | 129 ++++++++
  ...ent_subresource_filter_throttle_manager.cc |  15 +
  ...tent_subresource_filter_throttle_manager.h |   2 +
- .../content/browser/ruleset_service.cc        |  42 ++-
- .../content/browser/ruleset_service.h         |   7 +-
- .../content/browser/ruleset_version.h         |   4 +
+ .../content/shared/browser/ruleset_service.cc |  47 ++-
+ .../content/shared/browser/ruleset_service.h  |   8 +-
  .../unindexed_ruleset_stream_generator.cc     |   3 +
- .../browser/verified_ruleset_dealer.cc        |   3 +
+ .../core/browser/ruleset_version.h            |   4 +
  .../browser/subresource_filter_features.cc    | 116 +-------
+ .../core/browser/verified_ruleset_dealer.cc   |   4 +
  .../core/common/indexed_ruleset.cc            |   5 +-
- .../Bromite-subresource-adblocker.inc         |   3 +
- 40 files changed, 1254 insertions(+), 127 deletions(-)
+ 39 files changed, 1254 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,12 +62,11 @@ 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
-@@ -303,6 +303,7 @@ if (current_toolchain == default_toolchain) {
+@@ -357,6 +357,7 @@ if (current_toolchain == default_toolchain) {
        "//chrome/android/modules/cablev2_authenticator/public:java",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
@@ -79,15 +77,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -430,6 +430,7 @@ chrome_java_resources = [
-   "java/res/layout/account_chooser_dialog_title.xml",
+@@ -433,6 +433,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",
-@@ -633,6 +634,7 @@ chrome_java_resources = [
+@@ -623,6 +624,7 @@ chrome_java_resources = [
    "java/res/xml/about_chrome_preferences.xml",
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
@@ -98,7 +96,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -972,6 +972,8 @@ chrome_java_sources = [
+@@ -941,6 +941,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -182,7 +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.
+@@ -256,6 +256,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -210,7 +208,7 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -25,6 +25,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>
  
@@ -254,9 +252,9 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -78,6 +78,11 @@ found in the LICENSE file.
-         android:key="safety_check"
-         android:order="13"
+@@ -83,6 +83,11 @@ found in the LICENSE file.
+         android:key="safety_hub"
+         android:order="14"
          android:title="@string/prefs_safety_check"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
@@ -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="14"
+         android:order="15"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
 new file mode 100644
 --- /dev/null
@@ -428,19 +426,21 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-@@ -839,7 +839,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);
+@@ -853,9 +853,7 @@ public class TabModelImpl extends TabModelJniBridge {
+                 .createTabWithWebContents(
+                         parent,
+                         webContents,
+-                        select
+-                                ? TabLaunchType.FROM_RECENT_TABS_FOREGROUND
+-                                : TabLaunchType.FROM_RECENT_TABS);
++                        TabLaunchType.FROM_LINK);
      }
  
      @Override
 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
-@@ -15030,6 +15030,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -15905,6 +15905,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -469,7 +469,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
  using content::BrowserThread;
  
  namespace {
-@@ -132,6 +134,8 @@ void SetBrowserStartupIsComplete() {
+@@ -134,6 +136,8 @@ void SetBrowserStartupIsComplete() {
    }
    GetAfterStartupTasks().clear();
    GetAfterStartupTasks().shrink_to_fit();
@@ -481,7 +481,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -21,6 +21,7 @@
+@@ -31,6 +31,7 @@
  #include "build/chromeos_buildflags.h"
  #include "chrome/common/buildflags.h"
  #include "media/media_buildflags.h"
@@ -489,7 +489,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
  
  class BackgroundModeManager;
  class BrowserProcessPlatformPart;
-@@ -71,6 +72,10 @@ namespace component_updater {
+@@ -86,6 +87,10 @@ namespace component_updater {
  class ComponentUpdateService;
  }
  
@@ -497,10 +497,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;
  }
-@@ -245,6 +250,7 @@ class BrowserProcess {
+@@ -264,6 +269,7 @@ class BrowserProcess {
  #endif
  
    virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -511,7 +511,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1168,6 +1168,27 @@ BrowserProcessImpl::component_updater() {
+@@ -1197,6 +1197,27 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -542,7 +542,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -209,6 +209,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess,
  #endif
  
    component_updater::ComponentUpdateService* component_updater() override;
@@ -550,18 +550,18 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
    MediaFileSystemRegistry* media_file_system_registry() override;
    WebRtcLogUploader* webrtc_log_uploader() override;
    network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -405,6 +406,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -419,6 +420,7 @@ class BrowserProcessImpl : public BrowserProcess,
    // to concerns over integrity of data shared between profiles,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
 +  std::unique_ptr<adblock_updater::AdBlockUpdaterService> adblock_updater_;
  
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
+ #if !BUILDFLAG(IS_ANDROID)
    // Used to create a singleton instance of SodaInstallerImpl, which can be
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -446,6 +446,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -470,6 +470,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -582,7 +582,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") {
+@@ -46,6 +47,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 +590,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") {
+@@ -60,6 +62,7 @@ static_library("flags_android") {
      "android/chrome_session_state.cc",
      "android/chrome_session_state.h",
    ]
@@ -598,14 +598,6 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
    deps = [
      ":jni_headers",
      "//base",
-@@ -71,6 +74,7 @@ robolectric_library("flags_junit_tests") {
-     "android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlagsAnnotationUnitTest.java",
-     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithProcessorUnitTest.java",
-     "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureListWithoutProcessorUnitTest.java",
-+    "android/java/src/org/chromium/chrome/browser/flags/AdBlockNativeGateway.java",
-   ]
-   deps = [
-     ":java",
 diff --git a/chrome/browser/flags/android/adblock_native_gateway.cc b/chrome/browser/flags/android/adblock_native_gateway.cc
 new file mode 100755
 --- /dev/null
@@ -680,15 +672,11 @@ 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() {
+@@ -635,6 +635,10 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
  void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
  
-+#if BUILDFLAG(IS_ANDROID)
-+  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, true);
-+#else
 +  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);
-+#endif
 +  registry->RegisterStringPref(prefs::kAdBlockFiltersURL,
 +    "https://www.bromite.org/filters/filters.dat");
 +
@@ -698,14 +686,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(
+@@ -57,8 +57,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;
    }
@@ -714,7 +703,7 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -220,6 +220,20 @@ CHAR_LIMIT guidelines:
+@@ -218,6 +218,20 @@ CHAR_LIMIT guidelines:
          Advanced
        </message>
  
@@ -738,7 +727,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
-@@ -2653,6 +2653,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2824,6 +2824,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -753,7 +742,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
-@@ -359,6 +359,9 @@
+@@ -371,6 +371,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>
@@ -1111,7 +1100,7 @@ new file mode 100644
 +#include "components/component_updater/update_scheduler.h"
 +#include "url/gurl.h"
 +#include "components/component_updater/download_filters_task.h"
-+#include "components/subresource_filter/content/browser/ruleset_service.h"
++#include "components/subresource_filter/content/shared/browser/ruleset_service.h"
 +#include "services/network/public/cpp/shared_url_loader_factory.h"
 +
 +namespace adblock_updater {
@@ -1562,17 +1551,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
-@@ -14,6 +14,9 @@
- #include "base/metrics/histogram_macros.h"
+@@ -18,6 +18,9 @@
+ #include "base/strings/stringprintf.h"
  #include "base/trace_event/trace_event.h"
  #include "base/trace_event/traced_value.h"
 +#include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
- #include "components/subresource_filter/content/browser/activation_state_computing_navigation_throttle.h"
- #include "components/subresource_filter/content/browser/async_document_subresource_filter.h"
+ #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
  #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
-@@ -148,6 +151,7 @@ ContentSubresourceFilterThrottleManager::
+ #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
+@@ -110,6 +113,7 @@ ContentSubresourceFilterThrottleManager::
        profile_interaction_manager_(
            std::make_unique<subresource_filter::ProfileInteractionManager>(
                profile_context)),
@@ -1601,7 +1590,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
+@@ -411,6 +411,8 @@ class ContentSubresourceFilterThrottleManager
  
    std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
  
@@ -1610,21 +1599,21 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
    // Unowned since the throttle manager cannot outlive the Page that owns it.
    // The throttle manager is held as user data first on NavigationHandle, then
    // transferred to Page once it is created. Once the Page is created and this
-diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc
---- a/components/subresource_filter/content/browser/ruleset_service.cc
-+++ b/components/subresource_filter/content/browser/ruleset_service.cc
-@@ -46,9 +46,7 @@ namespace {
- 
+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
+@@ -51,9 +51,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,
+-      RulesetService::IndexAndWriteRulesetResult::MAX);
 +  VLOG(1) << "SubresourceFilter.WriteRuleset.Result: " << static_cast<int>(result);
  }
  
  // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -228,10 +226,13 @@ RulesetService::RulesetService(
+@@ -234,10 +232,13 @@ RulesetService::RulesetService(
  RulesetService::~RulesetService() {}
  
  void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1640,7 +1629,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
    // Trying to store a ruleset with the same version for a second time would
    // not only be futile, but would fail on Windows due to "File System
    // Tunneling" as long as the previously stored copy of the rules is still
-@@ -241,13 +242,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -247,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
    if (most_recently_indexed_version.IsCurrentFormatVersion() &&
        most_recently_indexed_version.content_version ==
            unindexed_ruleset_info.content_version) {
@@ -1657,11 +1646,15 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
      return;
    }
  
-@@ -266,6 +270,18 @@ IndexedRulesetVersion RulesetService::GetMostRecentlyIndexedVersion() const {
- IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -273,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+     const RulesetConfig& config,
      const base::FilePath& indexed_ruleset_base_dir,
      const UnindexedRulesetInfo& unindexed_ruleset_info) {
-+  IndexedRulesetVersion version = IndexAndWriteRulesetInternal(indexed_ruleset_base_dir, unindexed_ruleset_info);
++  IndexedRulesetVersion version =
++    IndexAndWriteRulesetInternal(
++        config,
++        indexed_ruleset_base_dir,
++        unindexed_ruleset_info);
 +  // cleanup temporary file when done
 +  if (unindexed_ruleset_info.delete_ruleset_path) {
 +    base::DeleteFile(unindexed_ruleset_info.ruleset_path);
@@ -1671,84 +1664,78 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
 +
 +// static
 +IndexedRulesetVersion RulesetService::IndexAndWriteRulesetInternal(
++    const RulesetConfig& config,
 +    const base::FilePath& indexed_ruleset_base_dir,
 +    const UnindexedRulesetInfo& unindexed_ruleset_info) {
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                  base::BlockingType::MAY_BLOCK);
  
-@@ -273,6 +289,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -280,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(
+         config.uma_tag,
          IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET);
-     return IndexedRulesetVersion();
-@@ -286,6 +303,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -294,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(
+         config.uma_tag,
          IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR);
-     return IndexedRulesetVersion();
-@@ -293,12 +311,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -302,13 +325,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
  
    SentinelFile sentinel_file(indexed_ruleset_version_dir);
    if (sentinel_file.IsPresent()) {
 -    RecordIndexAndWriteRulesetResult(
+-        config.uma_tag,
 -        IndexAndWriteRulesetResult::ABORTED_BECAUSE_SENTINEL_FILE_PRESENT);
--    return IndexedRulesetVersion();
+-    return IndexedRulesetVersion(config.filter_tag);
 +    LOG(WARNING) << "RulesetService: sentinel file is present in " << indexed_ruleset_version_dir;
    }
  
    if (!sentinel_file.Create()) {
 +    LOG(WARNING) << "RulesetService: cannot create sentinel file in " << indexed_ruleset_version_dir;
      RecordIndexAndWriteRulesetResult(
+         config.uma_tag,
          IndexAndWriteRulesetResult::FAILED_CREATING_SENTINEL_FILE);
-     return IndexedRulesetVersion();
-@@ -311,6 +328,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
- 
+@@ -323,6 +344,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(
+         config.uma_tag,
          IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET);
-     return IndexedRulesetVersion();
-@@ -328,8 +346,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -342,8 +364,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
        WriteRuleset(indexed_ruleset_version_dir,
                     unindexed_ruleset_info.license_path, indexer.data());
-   RecordIndexAndWriteRulesetResult(result);
+   RecordIndexAndWriteRulesetResult(config.uma_tag, result);
 -  if (result != IndexAndWriteRulesetResult::SUCCESS)
 +  if (result != IndexAndWriteRulesetResult::SUCCESS) {
 +    LOG(INFO) << "RulesetService: failed to index.";
-     return IndexedRulesetVersion();
+     return IndexedRulesetVersion(config.filter_tag);
 +  }
 +
 +  LOG(INFO) << "RulesetService: successful parsing.";
  
-   DCHECK(indexed_version.IsValid());
+   CHECK(indexed_version.IsValid(), base::NotFatalUntil::M129);
    return indexed_version;
-@@ -449,6 +471,7 @@ void RulesetService::IndexAndStoreRuleset(
+@@ -467,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(), base::NotFatalUntil::M129);
 +  LOG(INFO) << "RulesetService: valid version: " << version.IsValid();
    if (!version.IsValid())
      return;
    version.SaveToPrefs(local_state_);
-@@ -461,7 +484,6 @@ void RulesetService::OpenAndPublishRuleset(
-       IndexedRulesetLocator::GetRulesetDataFilePath(
-           IndexedRulesetLocator::GetSubdirectoryPathForVersion(
-               indexed_ruleset_base_dir_, version));
--
-   publisher_->TryOpenAndSetRulesetFile(
-       file_path, version.checksum,
-       base::BindOnce(&RulesetService::OnRulesetSet,
-diff --git a/components/subresource_filter/content/browser/ruleset_service.h b/components/subresource_filter/content/browser/ruleset_service.h
---- a/components/subresource_filter/content/browser/ruleset_service.h
-+++ b/components/subresource_filter/content/browser/ruleset_service.h
-@@ -182,7 +182,7 @@ class RulesetService {
+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 {
    //
    // Virtual so that it can be mocked out in tests.
    virtual void IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1757,22 +1744,43 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.h b/c
  
    // Get the ruleset version associated with the current local_state_.
    IndexedRulesetVersion GetMostRecentlyIndexedVersion() const;
-@@ -215,6 +215,11 @@ class RulesetService {
+@@ -221,6 +221,12 @@ class RulesetService {
        const base::FilePath& indexed_ruleset_base_dir,
        const UnindexedRulesetInfo& unindexed_ruleset_info);
  
 +  // internal function used to wrap the temporary file deletion for unindexed rulesets
 +  static IndexedRulesetVersion IndexAndWriteRulesetInternal(
++      const RulesetConfig& config,
 +      const base::FilePath& indexed_ruleset_base_dir,
 +      const UnindexedRulesetInfo& unindexed_ruleset_info);
 +
    // Reads the rules via the |unindexed_ruleset_stream_generator|, and indexes
    // them using |indexer|. Returns whether the entire ruleset could be parsed.
    static bool IndexRuleset(
-diff --git a/components/subresource_filter/content/browser/ruleset_version.h b/components/subresource_filter/content/browser/ruleset_version.h
---- a/components/subresource_filter/content/browser/ruleset_version.h
-+++ b/components/subresource_filter/content/browser/ruleset_version.h
-@@ -53,6 +53,10 @@ struct UnindexedRulesetInfo {
+diff --git a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
+--- a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
++++ b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
+@@ -13,6 +13,7 @@
+ #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h"
+ #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
+ #include "ui/base/resource/resource_bundle.h"
++#include "base/logging.h"
+ 
+ namespace subresource_filter {
+ 
+@@ -49,6 +50,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
+ 
+   ruleset_size_ = unindexed_ruleset_file.GetLength();
+ 
++  LOG(INFO) << "Opened " << ruleset_path << " size " << ruleset_size_;
++
+   copying_stream_ = std::make_unique<CopyingFileInputStream>(
+       std::move(unindexed_ruleset_file));
+   ruleset_stream_ =
+diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/components/subresource_filter/core/browser/ruleset_version.h
+--- a/components/subresource_filter/core/browser/ruleset_version.h
++++ b/components/subresource_filter/core/browser/ruleset_version.h
+@@ -54,6 +54,10 @@ struct UnindexedRulesetInfo {
    // 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;
@@ -1783,39 +1791,6 @@ diff --git a/components/subresource_filter/content/browser/ruleset_version.h b/c
  };
  
  // Encapsulates the combination of the binary format version of the indexed
-diff --git a/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc b/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
---- a/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
-+++ b/components/subresource_filter/content/browser/unindexed_ruleset_stream_generator.cc
-@@ -12,6 +12,7 @@
- #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h"
- #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
- #include "ui/base/resource/resource_bundle.h"
-+#include "base/logging.h"
- 
- namespace subresource_filter {
- 
-@@ -46,6 +47,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
- 
-   ruleset_size_ = unindexed_ruleset_file.GetLength();
- 
-+  LOG(INFO) << "Opened " << ruleset_path << " size " << ruleset_size_;
-+
-   copying_stream_ = std::make_unique<CopyingFileInputStream>(
-       std::move(unindexed_ruleset_file));
-   ruleset_stream_ =
-diff --git a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
---- a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
-+++ b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
-@@ -38,6 +38,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
-   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
-                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
-                file->IsValid());
-+
-+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();
-+
-   if (file->IsValid()) {
-     SetRulesetFile(file->Duplicate());
-     expected_checksum_ = expected_checksum;
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
@@ -1967,6 +1942,27 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
  
    return configs;
  }
+diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
+--- a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
++++ b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
+@@ -11,6 +11,7 @@
+ #include "base/functional/bind.h"
+ #include "base/functional/callback_helpers.h"
+ #include "base/location.h"
++#include "base/logging.h"
+ #include "base/not_fatal_until.h"
+ #include "base/notreached.h"
+ #include "base/task/sequenced_task_runner.h"
+@@ -40,6 +41,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
+   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
+                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
+                file->IsValid());
++
++  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();
++
+   if (file->IsValid()) {
+     SetRulesetFile(file->Duplicate());
+     expected_checksum_ = expected_checksum;
 diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc
 --- a/components/subresource_filter/core/common/indexed_ruleset.cc
 +++ b/components/subresource_filter/core/common/indexed_ruleset.cc
@@ -1975,10 +1971,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/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,
+ #include "base/metrics/histogram_functions.h"
+ #include "base/not_fatal_until.h"
+ #include "base/strings/strcat.h"
+@@ -38,7 +39,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());
@@ -1989,12 +1985,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);
 --

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

@@ -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
+@@ -224,6 +224,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
+@@ -1235,6 +1235,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   void SetAllowScreenshots(bool allow);
+   bool AreScreenshotsAllowed();
+ 
++  // 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.
+@@ -1274,13 +1287,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   ui::ColorProviderKey GetColorProviderKey() const override;
+ 
+  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;
+@@ -1291,11 +1297,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   friend class ui_devtools::PageAgentViews;
+   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_;
+--

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

@@ -6,19 +6,31 @@ In site settings added ability to block all popups per site
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../tab_under_navigation_throttle.cc          |   1 +
  .../android/popup_blocked_message_delegate.cc |  20 +++-
  .../android/popup_blocked_message_delegate.h  |   1 +
  components/blocked_content/popup_blocker.cc   |   3 +
  components/blocked_content_strings.grdp       |   3 +
  .../impl/BromitePopupContentSetting.java      | 106 ++++++++++++++++++
  .../bromite_content_settings/popups.grdp      |  12 ++
- .../bromite_content_settings/popups.inc       |   7 ++
+ .../bromite_content_settings/popups.inc       |   8 ++
  .../core/browser/content_settings_registry.cc |   2 +-
- 8 files changed, 151 insertions(+), 3 deletions(-)
+ 9 files changed, 153 insertions(+), 3 deletions(-)
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromitePopupContentSetting.java
  create mode 100644 components/browser_ui/strings/bromite_content_settings/popups.grdp
  create mode 100644 components/content_settings/core/browser/bromite_content_settings/popups.inc
 
+diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
+--- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
++++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
+@@ -72,6 +72,7 @@ void LogTabUnderAttempt(content::NavigationHandle* handle) {
+ BASE_FEATURE(kBlockTabUnders,
+              "BlockTabUnders",
+              base::FEATURE_DISABLED_BY_DEFAULT);
++SET_CROMITE_FEATURE_ENABLED(kBlockTabUnders);
+ 
+ // static
+ std::unique_ptr<content::NavigationThrottle>
 diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
 --- a/components/blocked_content/android/popup_blocked_message_delegate.cc
 +++ b/components/blocked_content/android/popup_blocked_message_delegate.cc
@@ -239,18 +251,19 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/p
 new file mode 100644
 --- /dev/null
 +++ b/components/content_settings/core/browser/bromite_content_settings/popups.inc
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,8 @@
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::POPUPS)
 +    ->set_show_into_info_page()
 +    .set_desktop_ui()
++    .set_is_renderer_content_setting()
 +    .set_allowed_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_ALLOWED)
 +    .set_ask_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCK_ALL)
 +    .set_blocked_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCKED);
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -131,7 +131,7 @@ void ContentSettingsRegistry::Init() {
+@@ -134,7 +134,7 @@ void ContentSettingsRegistry::Init() {
             WebsiteSettingsInfo::SYNCABLE,
             /*allowlisted_primary_schemes=*/
             {kChromeUIScheme, kChromeDevToolsScheme, kExtensionScheme},

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

@@ -13,37 +13,37 @@ Auto-update is disabled by default: it is possible to activate it with chrome://
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/app/extensions_strings.grdp            |  6 +++
- .../developer_private_api.cc                  | 37 ++++++++++++-
- .../developer_private/developer_private_api.h |  3 ++
- .../webstore_private/webstore_private_api.cc  | 15 +++++-
+ chrome/app/extensions_strings.grdp            |  6 ++
+ .../developer_private_api.cc                  | 38 +++++++++++-
+ .../developer_private/developer_private_api.h |  3 +
+ .../webstore_private/webstore_private_api.cc  | 15 ++++-
  chrome/browser/extensions/cws_info_service.cc |  1 +
  .../extensions/extension_system_impl.cc       |  2 +
  .../chrome_extension_downloader_factory.cc    |  1 -
- .../extensions/updater/extension_updater.cc   | 40 ++++++++------
+ .../extensions/updater/extension_updater.cc   | 40 ++++++++-----
  .../extensions/updater/extension_updater.h    |  4 ++
  .../extensions/webstore_install_helper.cc     |  2 +-
  .../browser/extensions/webstore_installer.cc  |  2 +-
  .../browser/resources/extensions/manager.html |  1 +
  .../browser/resources/extensions/manager.ts   |  7 +++
  .../browser/resources/extensions/service.ts   |  5 ++
- .../browser/resources/extensions/toolbar.html | 12 +++++
+ .../browser/resources/extensions/toolbar.html | 12 ++++
  .../browser/resources/extensions/toolbar.ts   | 20 +++++++
  .../resources/webstore_app/manifest.json      |  7 +--
  .../ui/webui/extensions/extensions_ui.cc      |  8 +++
- .../chrome_update_query_params_delegate.cc    | 13 ++---
+ .../chrome_update_query_params_delegate.cc    | 13 ++--
  .../extensions/api/developer_private.idl      |  2 +
- .../update_client/update_query_params.cc      |  7 ++-
- .../about_flags_cc/Webstore-protection.inc    | 19 +++++++
- .../browser/api/management/management_api.cc  | 50 +++++++++++------
- .../browser/updater/extension_downloader.cc   | 53 +++++++------------
+ .../update_client/update_query_params.cc      |  7 +--
+ .../about_flags_cc/Webstore-protection.inc    | 19 ++++++
+ .../browser/api/management/management_api.cc  | 60 ++++++++++++-------
+ .../browser/updater/extension_downloader.cc   | 53 +++++++---------
  .../browser/updater/extension_downloader.h    |  1 -
  .../browser/updater/manifest_fetch_data.cc    |  8 +--
  .../browser/updater/safe_manifest_parser.cc   |  1 +
- extensions/common/extension_features.cc       | 15 ++++++
+ extensions/common/extension_features.cc       | 15 +++++
  extensions/common/extension_features.h        |  4 ++
- .../definitions/developer_private.d.ts        |  4 +-
- 30 files changed, 252 insertions(+), 98 deletions(-)
+ .../definitions/developer_private.d.ts        |  2 +
+ 30 files changed, 256 insertions(+), 103 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
 
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
@@ -65,7 +65,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
-@@ -127,6 +127,12 @@
+@@ -131,6 +131,12 @@
  #include "url/gurl.h"
  #include "url/origin.h"
  
@@ -75,13 +75,14 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 +#include "components/flags_ui/feature_entry.h"
 +#include "components/flags_ui/flags_storage.h"
 +
- #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
- #include "components/supervised_user/core/browser/supervised_user_preferences.h"
- #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
-@@ -476,9 +482,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
-   info->can_load_unpacked =
-       ExtensionManagementFactory::GetForBrowserContext(profile)
-           ->HasAllowlistedExtension();
+ namespace extensions {
+ 
+ namespace developer = api::developer_private;
+@@ -476,10 +482,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
+   info->is_mv2_deprecation_notice_dismissed =
+       ManifestV2ExperimentManager::Get(profile)
+           ->DidUserAcknowledgeNoticeGlobally();
+-
 +  info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
    return info;
  }
@@ -111,7 +112,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  template <>
  void BrowserContextKeyedAPIFactory<
      DeveloperPrivateAPI>::DeclareFactoryDependencies() {
-@@ -908,6 +937,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -917,6 +945,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
      ExtensionUpdater::CheckParams params;
      params.fetch_priority = DownloadFetchPriority::kForeground;
      params.install_immediately = true;
@@ -119,7 +120,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
      params.callback =
          base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
      updater->CheckNow(std::move(params));
-@@ -1048,7 +1078,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -1057,7 +1086,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
  
    const developer::ProfileConfigurationUpdate& update = params->update;
  
@@ -127,9 +128,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 +  if (update.in_developer_mode.has_value() && update.in_developer_mode) {
      Profile* profile = Profile::FromBrowserContext(browser_context());
      CHECK(profile);
- #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-@@ -1060,6 +1090,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
-     util::SetDeveloperModeForProfile(profile, *update.in_developer_mode);
+     if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
+@@ -1071,6 +1100,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+         ->MarkNoticeAsAcknowledgedGlobally();
    }
  
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
@@ -143,7 +144,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -233,6 +233,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+@@ -234,6 +234,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
    static std::unique_ptr<api::developer_private::ProfileInfo> CreateProfileInfo(
        Profile* profile);
  
@@ -156,7 +157,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -60,6 +60,7 @@
+@@ -67,6 +67,7 @@
  #include "extensions/browser/extension_system.h"
  #include "extensions/browser/extension_util.h"
  #include "extensions/common/extension.h"
@@ -164,15 +165,16 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -230,12 +231,16 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -227,6 +228,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
  // there was previously stored data, or an empty string otherwise. The Set will
  // overwrite any previous login.
  std::string GetWebstoreLogin(Profile* profile) {
 +  if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
 +    return std::string();
-   if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin))
+   if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
      return profile->GetPrefs()->GetString(kWebstoreLogin);
-   return std::string();
+   }
+@@ -234,6 +237,8 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -181,7 +183,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    profile->GetPrefs()->SetString(kWebstoreLogin, login);
  }
  
-@@ -245,6 +250,8 @@ void RecordWebstoreExtensionInstallResult(bool success) {
+@@ -243,6 +248,8 @@ void RecordWebstoreExtensionInstallResult(bool success) {
  
  api::webstore_private::ExtensionInstallStatus
  ConvertExtensionInstallStatusForAPI(ExtensionInstallStatus status) {
@@ -190,7 +192,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    switch (status) {
      case kCanRequest:
        return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1163,7 +1170,8 @@ ExtensionFunction::ResponseAction
+@@ -1174,7 +1181,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -200,7 +202,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1262,11 +1270,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1269,11 +1277,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -219,7 +221,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/extensions/cws_info_service.cc b/chrome/browser/extensions/cws_info_service.cc
 --- a/chrome/browser/extensions/cws_info_service.cc
 +++ b/chrome/browser/extensions/cws_info_service.cc
-@@ -160,6 +160,7 @@ namespace extensions {
+@@ -163,6 +163,7 @@ namespace extensions {
  BASE_FEATURE(kCWSInfoService,
               "CWSInfoService",
               base::FEATURE_ENABLED_BY_DEFAULT);
@@ -249,7 +251,7 @@ diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser
 diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
-@@ -49,7 +49,6 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
+@@ -50,7 +50,6 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
      manifest_query_params += "&testrequest=1";
    }
    downloader->set_manifest_query_params(manifest_query_params);
@@ -260,7 +262,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto
 diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
 --- a/chrome/browser/extensions/updater/extension_updater.cc
 +++ b/chrome/browser/extensions/updater/extension_updater.cc
-@@ -43,6 +43,7 @@
+@@ -47,6 +47,7 @@
  #include "extensions/browser/updater/extension_update_data.h"
  #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
@@ -268,7 +270,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  #include "extensions/common/extension_set.h"
  #include "extensions/common/extension_updater_uma.h"
  #include "extensions/common/extension_urls.h"
-@@ -197,6 +198,10 @@ void ExtensionUpdater::Start() {
+@@ -201,6 +202,10 @@ void ExtensionUpdater::Start() {
    DCHECK(!weak_ptr_factory_.HasWeakPtrs());
    DCHECK(registry_);
    alive_ = true;
@@ -279,7 +281,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    // Check soon, and set up the first delayed check.
    if (!g_skip_scheduled_checks_for_tests) {
      if (g_should_immediately_update)
-@@ -329,7 +334,8 @@ void ExtensionUpdater::AddToDownloader(
+@@ -333,7 +338,8 @@ void ExtensionUpdater::AddToDownloader(
      const Extension& extension = **extension_iter;
      const ExtensionId& extension_id = extension.id();
      if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -289,16 +291,16 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        continue;
      }
      // An extension might be overwritten by policy, and have its update url
-@@ -343,7 +349,7 @@ void ExtensionUpdater::AddToDownloader(
+@@ -347,7 +353,7 @@ void ExtensionUpdater::AddToDownloader(
        continue;
      }
  
 -    if (CanUseUpdateService(extension_id)) {
 +    if ((false) && CanUseUpdateService(extension_id)) {
-       update_check_params->update_info[extension_id] = ExtensionUpdateData();
+       update_check_params->update_info[extension_id] =
+           GetExtensionUpdateData(extension_id);
      } else if (AddExtensionToDownloader(extension, request_id,
-                                         fetch_priority)) {
-@@ -381,6 +387,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
+@@ -386,6 +392,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
  }
  
  void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -311,7 +313,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    if (params.ids.empty()) {
      // Checking all extensions. Cancel pending DoCheckSoon() call if there's
      // one, as it would be redundant.
-@@ -389,7 +401,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -394,7 +406,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
  
    int request_id = next_request_id_++;
  
@@ -320,25 +322,25 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    if (params.ids.empty())
      NotifyStarted();
  
-@@ -461,7 +473,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-                                      << " is not a corrupt reinstall";
-         update_check_params.update_info[pending_id] = ExtensionUpdateData();
+@@ -467,7 +479,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+         update_check_params.update_info[pending_id] =
+             GetExtensionUpdateData(pending_id);
        } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {
 -        VLOG(2) << "Extension " << pending_id << " is not auto updateable";
 +        LOG(INFO) << "Extension " << pending_id << " is not auto updateable";
          continue;
        }
        // We have to mark high-priority extensions (such as policy-forced
-@@ -471,7 +483,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -477,7 +489,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
        // See https://crbug.com/904600 and https://crbug.com/965686.
        const bool is_high_priority_extension_pending =
            pending_extension_manager->HasHighPriorityPendingExtension();
 -      if (CanUseUpdateService(pending_id)) {
 +      if ((false) && CanUseUpdateService(pending_id)) {
+         update_check_params.update_info[pending_id] =
+             GetExtensionUpdateData(pending_id);
          update_check_params.update_info[pending_id].is_corrupt_reinstall =
-             is_corrupt_reinstall;
-         if (is_corrupt_reinstall) {
-@@ -492,6 +504,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -500,6 +512,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
            LOG(WARNING) << "Corrupt extension with id " << pending_id
                         << " will be reinstalled with ExtensionDownloader.";
          }
@@ -347,7 +349,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        } else {
          InstallStageTracker::Get(profile_)->ReportFailure(
              pending_id,
-@@ -504,13 +518,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -512,13 +526,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
      AddToDownloader(&registry_->disabled_extensions(), pending_ids, request_id,
                      params.fetch_priority, &update_check_params);
      ExtensionSet remotely_disabled_extensions;
@@ -361,16 +363,16 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
      AddToDownloader(&remotely_disabled_extensions, pending_ids, request_id,
                      params.fetch_priority, &update_check_params);
    } else {
-@@ -518,7 +525,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -526,7 +533,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
        const Extension* extension =
            registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
        if (extension) {
 -        if (CanUseUpdateService(id)) {
 +        if ((false) && CanUseUpdateService(id)) {
-           update_check_params.update_info[id] = ExtensionUpdateData();
+           update_check_params.update_info[id] = GetExtensionUpdateData(id);
          } else if (AddExtensionToDownloader(*extension, request_id,
                                              params.fetch_priority)) {
-@@ -659,7 +666,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -667,7 +674,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
        file.extension_id, InstallStageTracker::Stage::INSTALLING);
    UpdatePingData(file.extension_id, ping);
  
@@ -379,7 +381,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  
    FetchedCRXFile fetched(file, file_ownership_passed, request_ids,
                           std::move(callback));
-@@ -670,6 +677,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -678,6 +685,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
  
  bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                 DownloadPingData* ping_data) {
@@ -387,7 +389,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    DCHECK(alive_);
    ping_data->rollcall_days =
        CalculatePingDaysForExtension(extension_prefs_->LastPingDay(id));
-@@ -768,7 +776,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -790,7 +798,7 @@ bool ExtensionUpdater::CanUseUpdateService(
  void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
    std::set<int> request_ids;
  
@@ -396,7 +398,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
            << crx_file.info.path.value();
  
    // The ExtensionService is now responsible for cleaning up the temp file
-@@ -877,7 +885,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+@@ -899,7 +907,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
    InProgressCheck& request = requests_in_progress_[request_id];
    if (!request.in_progress_ids.empty() || request.awaiting_update_service)
      return;  // This request is not done yet.
@@ -408,7 +410,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
 --- a/chrome/browser/extensions/updater/extension_updater.h
 +++ b/chrome/browser/extensions/updater/extension_updater.h
-@@ -80,6 +80,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -82,6 +82,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
      // right away.
      bool install_immediately = false;
  
@@ -417,7 +419,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
      // An extension update check can be originated by a user or by a scheduled
      // task. When the value of |fetch_priority| is FOREGROUND, the update
      // request was initiated by a user.
-@@ -327,6 +329,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -333,6 +335,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
    base::TimeDelta frequency_;
    bool will_check_soon_ = false;
  
@@ -464,8 +466,8 @@ diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/r
 diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts
 --- a/chrome/browser/resources/extensions/manager.ts
 +++ b/chrome/browser/resources/extensions/manager.ts
-@@ -122,6 +122,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-         value: () => loadTimeData.getBoolean('inDevMode'),
+@@ -120,6 +120,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+         value: () => loadTimeData.getBoolean('MV2DeprecationNoticeDismissed'),
        },
  
 +      isExtUpdateEnabled: {
@@ -476,18 +478,18 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
        showActivityLog: {
          type: Boolean,
          value: () => loadTimeData.getBoolean('showActivityLog'),
-@@ -223,6 +228,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-   canLoadUnpacked: boolean;
+@@ -210,6 +215,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
    delegate: Service;
    inDevMode: boolean;
+   isMv2DeprecationNoticeDismissed: boolean;
 +  isExtUpdateEnabled: boolean;
    showActivityLog: boolean;
    enableEnhancedSiteControls: boolean;
    devModeControlledByPolicy: boolean;
-@@ -293,6 +299,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-               profileInfo.isDeveloperModeControlledByPolicy;
-           this.inDevMode = profileInfo.inDeveloperMode;
+@@ -277,6 +283,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
            this.canLoadUnpacked = profileInfo.canLoadUnpacked;
+           this.isMv2DeprecationNoticeDismissed =
+               profileInfo.isMv2DeprecationNoticeDismissed;
 +          this.isExtUpdateEnabled = profileInfo.isExtensionAutoupdateEnabled;
          };
      service.getProfileStateChangedTarget().addListener(onProfileStateChanged);
@@ -495,7 +497,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -284,6 +284,11 @@ export class Service implements ServiceInterface {
+@@ -290,6 +290,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -539,7 +541,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/r
 diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts
 --- a/chrome/browser/resources/extensions/toolbar.ts
 +++ b/chrome/browser/resources/extensions/toolbar.ts
-@@ -26,6 +26,8 @@ export interface ToolbarDelegate {
+@@ -25,6 +25,8 @@ export interface ToolbarDelegate {
     */
    setProfileInDevMode(inDevMode: boolean): void;
  
@@ -548,7 +550,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
    /** Opens the dialog to load unpacked extensions. */
    loadUnpacked(): Promise<boolean>;
  
-@@ -72,6 +74,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -67,6 +69,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
          reflectToAttribute: true,
        },
  
@@ -562,7 +564,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
        devModeControlledByPolicy: Boolean,
        isChildAccount: Boolean,
  
-@@ -88,6 +97,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -79,6 +88,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
  
        expanded_: Boolean,
        showPackDialog_: Boolean,
@@ -570,7 +572,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
  
        /**
         * Prevents initiating update while update is in progress.
-@@ -99,6 +109,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -90,6 +100,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
    extensions: chrome.developerPrivate.ExtensionInfo[];
    delegate: ToolbarDelegate;
    inDevMode: boolean;
@@ -579,7 +581,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
    devModeControlledByPolicy: boolean;
    isChildAccount: boolean;
  
-@@ -151,6 +163,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -138,6 +150,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
          'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
    }
  
@@ -613,8 +615,8 @@ diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browse
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -58,6 +58,8 @@
- #include "chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.h"
+@@ -63,6 +63,8 @@
+ #include "chrome/browser/ash/crosapi/browser_util.h"
  #endif
  
 +#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
@@ -622,16 +624,16 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
  namespace extensions {
  
  namespace {
-@@ -340,6 +342,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
-     {"itemSuspiciousInstallLearnMore",
-      IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
-     {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
-+    {"toolbarExtensionUpdateEnabled", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED},
-+    {"toolbarExtensionUpdateEnabledNeedRestart", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR},
-     {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
-     {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
-     {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -420,6 +424,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -376,6 +378,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+       {"itemSuspiciousInstallLearnMore",
+        IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
+       {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
++      {"toolbarExtensionUpdateEnabled", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED},
++      {"toolbarExtensionUpdateEnabledNeedRestart", IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED_NR},
+       {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
+       {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
+       {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
+@@ -448,6 +452,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
    source->AddString("hostPermissionsLearnMoreLink",
                      chrome_extension_constants::kRuntimeHostPermissionsHelpURL);
    source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -668,18 +670,18 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
-@@ -278,6 +278,7 @@ namespace developerPrivate {
-     boolean isDeveloperModeControlledByPolicy;
+@@ -292,6 +292,7 @@ namespace developerPrivate {
      boolean isIncognitoAvailable;
      boolean isChildAccount;
+     boolean isMv2DeprecationNoticeDismissed;
 +    boolean isExtensionAutoupdateEnabled;
    };
  
    // DEPRECATED: Prefer ExtensionInfo.
-@@ -335,6 +336,7 @@ namespace developerPrivate {
- 
+@@ -351,6 +352,7 @@ namespace developerPrivate {
    dictionary ProfileConfigurationUpdate {
      boolean? inDeveloperMode;
+     boolean? isMv2DeprecationNoticeDismissed;
 +    boolean? isExtensionAutoupdateEnabled;
    };
  
@@ -687,7 +689,7 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/
 diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc
 --- a/components/update_client/update_query_params.cc
 +++ b/components/update_client/update_query_params.cc
-@@ -88,9 +88,8 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
+@@ -86,9 +86,8 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
  // static
  std::string UpdateQueryParams::Get(ProdId prod) {
    return base::StringPrintf(
@@ -699,7 +701,7 @@ diff --git a/components/update_client/update_query_params.cc b/components/update
        g_delegate ? g_delegate->GetExtraParams().c_str() : "");
  }
  
-@@ -151,7 +150,7 @@ const char* UpdateQueryParams::GetNaclArch() {
+@@ -149,7 +148,7 @@ const char* UpdateQueryParams::GetNaclArch() {
  
  // static
  std::string UpdateQueryParams::GetProdVersion() {
@@ -745,15 +747,15 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  #include "extensions/browser/api/extensions_api_client.h"
  #include "extensions/browser/api/management/management_api_constants.h"
  #include "extensions/browser/disable_reason.h"
-@@ -39,6 +42,7 @@
+@@ -40,6 +43,7 @@
  #include "extensions/common/api/management.h"
  #include "extensions/common/error_utils.h"
  #include "extensions/common/extension.h"
 +#include "extensions/common/extension_features.h"
- #include "extensions/common/extension_icon_set.h"
  #include "extensions/common/extension_id.h"
  #include "extensions/common/extension_urls.h"
-@@ -90,6 +94,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
+ #include "extensions/common/icons/extension_icon_set.h"
+@@ -91,6 +95,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
    return warnings_list;
  }
  
@@ -781,7 +783,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  std::vector<management::LaunchType> GetAvailableLaunchTypes(
      const Extension& extension,
      const ManagementAPIDelegate* delegate) {
-@@ -263,6 +288,8 @@ void AddExtensionInfo(const Extension* source_extension,
+@@ -268,6 +293,8 @@ void AddExtensionInfo(const Extension* source_extension,
                        const ExtensionSet& extensions,
                        ExtensionInfoList* extension_list,
                        content::BrowserContext* context) {
@@ -790,7 +792,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    for (ExtensionSet::const_iterator iter = extensions.begin();
         iter != extensions.end(); ++iter) {
      const Extension& extension = **iter;
-@@ -308,10 +335,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
+@@ -313,10 +340,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
    std::optional<management::Get::Params> params =
        management::Get::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
@@ -799,39 +801,63 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    const Extension* target_extension =
 -      registry->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
 +      GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
-   if (!target_extension)
+   if (!target_extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
- 
-@@ -331,8 +357,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
+   }
+@@ -337,8 +363,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
    EXTENSION_FUNCTION_VALIDATE(params);
  
    const Extension* extension =
 -      ExtensionRegistry::Get(browser_context())
 -          ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
 +      GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
-   if (!extension)
+   if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
- 
-@@ -398,8 +423,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
-     return RespondNow(Error(keys::kNotAllowedInKioskError));
+   }
+@@ -406,8 +431,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
+   }
  
    const Extension* extension =
 -      ExtensionRegistry::Get(browser_context())
 -          ->GetExtensionById(params->id, ExtensionRegistry::EVERYTHING);
 +      GetExtensionById(GetSenderWebContents(), browser_context(), params->id, ExtensionRegistry::EVERYTHING);
-   if (!extension)
+   if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
-   if (!extension->is_app())
-@@ -434,7 +458,7 @@ ExtensionFunction::ResponseAction ManagementSetEnabledFunction::Run() {
-                                               ->GetDelegate();
- 
-   const Extension* target_extension =
--      registry->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
-+      GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_, ExtensionRegistry::EVERYTHING);
-   if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
-     return RespondNow(Error(keys::kNoExtensionError, extension_id_));
    }
-@@ -629,8 +653,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -548,8 +572,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
+   // Extension could have been uninstalled externally while previous check was
+   // happening.
+   const Extension* extension =
+-      ExtensionRegistry::Get(browser_context())
+-          ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
++      GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
++                       ExtensionRegistry::EVERYTHING);
+   if (!extension) {
+     FinishEnable(Error(keys::kNoExtensionError));
+     return;
+@@ -592,8 +616,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
+   // Extension can be uninstalled externally while the previous check was
+   // happening async.
+   const Extension* extension =
+-      ExtensionRegistry::Get(browser_context())
+-          ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
++      GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
++                       ExtensionRegistry::EVERYTHING);
+   if (!extension) {
+     FinishEnable(Error(keys::kNoExtensionError));
+     return;
+@@ -737,8 +761,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
+ }
+ 
+ const Extension* ManagementSetEnabledFunction::GetExtension() {
+-  return ExtensionRegistry::Get(browser_context())
+-      ->GetExtensionById(extension_id_, ExtensionRegistry::EVERYTHING);
++  return GetExtensionById(GetSenderWebContents(), browser_context(), extension_id_,
++                          ExtensionRegistry::EVERYTHING);
+ }
+ 
+ ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
+@@ -763,8 +787,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                                ->GetDelegate();
    target_extension_id_ = target_extension_id;
    const Extension* target_extension =
@@ -841,7 +867,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
      return RespondNow(Error(keys::kNoExtensionError, target_extension_id_));
-@@ -694,8 +717,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -829,8 +852,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
    // The extension can be uninstalled in another window while the UI was
    // showing. Do nothing in that case.
    const Extension* target_extension =
@@ -851,7 +877,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    std::string error;
    bool success = false;
-@@ -776,8 +798,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -907,8 +929,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
        management::CreateAppShortcut::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -861,7 +887,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(
          ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
-@@ -827,8 +848,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -961,8 +982,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
        management::SetLaunchType::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -1057,7 +1083,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
 diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/browser/updater/extension_downloader.h
 --- a/extensions/browser/updater/extension_downloader.h
 +++ b/extensions/browser/updater/extension_downloader.h
-@@ -112,7 +112,6 @@ class ExtensionDownloader {
+@@ -113,7 +113,6 @@ class ExtensionDownloader {
    }
  
    void set_ping_enabled_domain(const std::string& domain) {
@@ -1099,7 +1125,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
 diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
 --- a/extensions/browser/updater/safe_manifest_parser.cc
 +++ b/extensions/browser/updater/safe_manifest_parser.cc
-@@ -202,6 +202,7 @@ void ParseXmlDone(ParseUpdateManifestCallback callback,
+@@ -203,6 +203,7 @@ void ParseXmlDone(ParseUpdateManifestCallback callback,
          std::move(callback).Run(/*results=*/nullptr, std::move(error));
        });
  
@@ -1110,8 +1136,8 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
 diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
 --- a/extensions/common/extension_features.cc
 +++ b/extensions/common/extension_features.cc
-@@ -158,4 +158,19 @@ BASE_FEATURE(kDeclarativeNetRequestResponseHeaderMatching,
-              "DeclarativeNetRequestResponseHeaderMatching",
+@@ -190,4 +190,19 @@ BASE_FEATURE(kUseNewServiceWorkerTaskQueue,
+              "UseNewServiceWorkerTaskQueue",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +// Activates the auto update of extensions.
@@ -1133,9 +1159,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -200,6 +200,10 @@ BASE_DECLARE_FEATURE(kDeclarativeNetRequestSafeRuleLimits);
- // matching condition.
- BASE_DECLARE_FEATURE(kDeclarativeNetRequestResponseHeaderMatching);
+@@ -224,6 +224,10 @@ BASE_DECLARE_FEATURE(kUseItemSnippetsAPI);
+ // If enabled, use the new simpler, more efficient service worker task queue.
+ BASE_DECLARE_FEATURE(kUseNewServiceWorkerTaskQueue);
  
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
 +
@@ -1147,20 +1173,18 @@ diff --git a/extensions/common/extension_features.h b/extensions/common/extensio
 diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
 --- a/tools/typescript/definitions/developer_private.d.ts
 +++ b/tools/typescript/definitions/developer_private.d.ts
-@@ -263,6 +263,7 @@ declare global {
-         isDeveloperModeControlledByPolicy: boolean;
+@@ -277,6 +277,7 @@ declare global {
          isIncognitoAvailable: boolean;
          isChildAccount: boolean;
+         isMv2DeprecationNoticeDismissed: boolean;
 +        isExtensionAutoupdateEnabled: boolean;
        }
  
        export interface ExtensionConfigurationUpdate {
-@@ -277,7 +278,8 @@ declare global {
-       }
- 
+@@ -293,6 +294,7 @@ declare global {
        export interface ProfileConfigurationUpdate {
--        inDeveloperMode: boolean;
-+        inDeveloperMode?: boolean;
+         inDeveloperMode?: boolean;
+         isMv2DeprecationNoticeDismissed?: boolean;
 +        isExtensionAutoupdateEnabled?: boolean;
        }
  

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

@@ -9,8 +9,8 @@ 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
@@ -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(
+@@ -835,6 +835,10 @@ void PreflightController::ClearCorsPreflightCache(
    cache_.ClearCache(std::move(url_filter));
  }
  
@@ -51,7 +51,7 @@ 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(), base::NotFatalUntil::M130);
 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
@@ -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
-@@ -1179,6 +1179,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
-       base::BindOnce(&NetworkContext::OnHttpCacheCleared,
-                      base::Unretained(this), std::move(callback))));
- 
+@@ -1275,6 +1275,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(
 --

build/patches/Client-hints-overrides.patch

@@ -7,20 +7,23 @@ 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 +++++
- .../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   |  1 +
- .../common/client_hints/enabled_client_hints.cc |  4 +++-
- .../blink/renderer/core/frame/navigator_ua.idl  |  4 +++-
- .../renderer/core/frame/navigator_ua_data.idl   |  5 ++++-
- .../renderer/core/loader/base_fetch_context.cc  |  6 ++++--
- .../platform/runtime_enabled_features.json5     |  4 ++++
- 13 files changed, 40 insertions(+), 14 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       |  5 +++++
+ 15 files changed, 55 insertions(+), 13 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
 
@@ -41,7 +44,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -55,6 +55,7 @@
+@@ -60,6 +60,7 @@
  #include "third_party/blink/public/common/permissions_policy/origin_with_possible_wildcards.h"
  #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -49,17 +52,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  #include "ui/display/display.h"
  #include "ui/display/screen.h"
  #include "url/origin.h"
-@@ -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(
+@@ -722,7 +723,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
      // value, disable them. This overwrites previous decision from UI.
      disable_due_to_custom_ua = !ua_metadata.has_value();
    }
@@ -69,7 +62,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
    if (!disable_due_to_custom_ua) {
      if (!ua_metadata.has_value())
        ua_metadata = delegate->GetUserAgentMetadata();
-@@ -900,10 +903,12 @@ void AddRequestClientHintsHeaders(
+@@ -904,10 +906,12 @@ void AddRequestClientHintsHeaders(
      AddEctHeader(headers, network_quality_tracker, url);
    }
  
@@ -86,10 +79,18 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  
    if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
      AddPrefersColorSchemeHeader(headers, frame_tree_node);
+@@ -1001,6 +1005,7 @@ ParseAndPersistAcceptCHForNavigation(
+     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
-@@ -1091,6 +1091,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1208,6 +1208,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -101,6 +102,20 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow
    LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent);
  
    // Given that this is happening in the middle of navigation, there should
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
+@@ -0,0 +1,9 @@
++#ifdef FLAG_SECTION
++
++    {"enable-ua-client-hint",
++     "Enable UA client hint",
++     "Allow sending base low entropy client hints as "
++     "UA, UAMobile and UAPlatform for compatibility", kOsAll,
++     FEATURE_VALUE_TYPE(blink::features::kUserAgentClientHint)},
++
++#endif
 diff --git a/cromite_flags/content/common/features_cc/Client-hints-overrides.inc b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc
 new file mode 100644
 --- /dev/null
@@ -116,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
-@@ -101,6 +101,7 @@ const size_t kMaxRestarts = 32;
+@@ -108,6 +108,7 @@ const size_t kMaxRestarts = 32;
  
  // Returns true when Early Hints are allowed on the given protocol.
  bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -131,49 +146,52 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ
  
  std::optional<std::vector<network::mojom::WebClientHintsType>>
  ParseClientHintsHeader(const std::string& header) {
-+  if ((true)) return absl::nullopt;
++  if ((true)) return std::nullopt;
    // Accept-CH is an sh-list of tokens; see:
    // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1
    std::optional<net::structured_headers::List> maybe_list =
 diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
 --- a/third_party/blink/common/client_hints/client_hints.cc
 +++ b/third_party/blink/common/client_hints/client_hints.cc
-@@ -105,6 +105,7 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
- }
+@@ -14,6 +14,7 @@
+ #include "base/strings/string_util.h"
+ #include "services/network/public/cpp/client_hints.h"
+ #include "third_party/blink/public/common/features.h"
++#include "third_party/blink/public/common/features_generated.h"
+ #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
+ #include "url/origin.h"
+ 
+@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
  
  bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
-+  if ((true)) return false;
    switch (type) {
-     case network::mojom::WebClientHintsType::kSaveData:
+-    case network::mojom::WebClientHintsType::kSaveData:
      case network::mojom::WebClientHintsType::kUA:
+     case network::mojom::WebClientHintsType::kUAMobile:
+     case network::mojom::WebClientHintsType::kUAPlatform:
+-      return true;
++      return base::FeatureList::IsEnabled(blink::features::kUserAgentClientHint);
++    case network::mojom::WebClientHintsType::kSaveData:
++      return false;
+     default:
+       return false;
+   }
 diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc
 --- a/third_party/blink/common/client_hints/enabled_client_hints.cc
 +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc
-@@ -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
@@ -187,6 +205,17 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 +] interface mixin NavigatorUA {
    [SecureContext] readonly attribute NavigatorUAData userAgentData;
  };
+diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
+--- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
++++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
+@@ -219,6 +219,7 @@ ScriptPromise<UADataValues> NavigatorUAData::getHighEntropyValues(
+   Dactyloscoper::RecordDirectSurface(
+       GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform());
+ 
++  if ((false))
+   for (const String& hint : hints) {
+     if (hint == "platformVersion") {
+       values->setPlatformVersion(platform_version_);
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
@@ -202,48 +231,40 @@ 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
+@@ -216,6 +216,8 @@ bool ShouldSendClientHint(const 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(
+@@ -600,7 +602,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
-@@ -499,6 +499,10 @@
-       name: "ByobFetch",
-       status: "stable",
+@@ -381,6 +381,11 @@
+       name: "AtomicMoveAPI",
+       status: "test",
      },
 +    {
-+      name: "UserAgentClientHint",  // always disabled
-+      status: "experimental",       // in bromite
++      name: "UserAgentClientHint",
++      status: "stable",
++      base_feature: "UserAgentClientHint",
 +    },
      {
-       name: "CacheStorageCodeCacheHint",
-       origin_trial_feature_name: "CacheStorageCodeCacheHint",
+       name: "AttributionReporting",
+       status: "stable",
 --

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

@@ -0,0 +1,99 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 18 Jun 2024 14:14:06 +0000
+Subject: Close sessions on ip change
+
+Exposed a flag to change the behaviour of the network stack with regard
+to the automatic reconnection of quic connections when the connection changes.
+By default changed from automatic reconnection to close connection on ip change.
+No change in doh connections.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../browser/network_session_configurator.cc        | 11 ++++-------
+ .../about_flags_cc/Close-Sessions-On-Ip-Change.inc | 14 ++++++++++++++
+ .../features_cc/Close-Sessions-On-Ip-Change.inc    |  5 +++++
+ .../features_h/Close-Sessions-On-Ip-Change.inc     |  3 +++
+ net/base/features.cc                               |  2 +-
+ 5 files changed, 27 insertions(+), 8 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
+ create mode 100644 cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
+ create mode 100644 cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
+
+diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
+--- a/components/network_session_configurator/browser/network_session_configurator.cc
++++ b/components/network_session_configurator/browser/network_session_configurator.cc
+@@ -219,9 +219,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
+ 
+ bool ShouldQuicCloseSessionsOnIpChange(
+     const VariationParameters& quic_trial_params) {
+-  return base::EqualsCaseInsensitiveASCII(
+-      GetVariationParam(quic_trial_params, "close_sessions_on_ip_change"),
+-      "true");
++  return base::FeatureList::IsEnabled(
++          net::features::kCloseSessionsOnIpChange);
+ }
+ 
+ bool ShouldQuicGoAwaySessionsOnIpChange(
+@@ -302,10 +301,8 @@ bool ShouldQuicEstimateInitialRtt(
+ 
+ bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
+     const VariationParameters& quic_trial_params) {
+-  return GetVariationBoolParamOrFeatureSetting(
+-      quic_trial_params, "migrate_sessions_on_network_change_v2",
+-      base::FeatureList::IsEnabled(
+-          net::features::kMigrateSessionsOnNetworkChangeV2));
++  return base::FeatureList::IsEnabled(
++          net::features::kMigrateSessionsOnNetworkChangeV2);
+ }
+ 
+ bool ShouldQuicUseNewAlpsCodepoint(
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc b/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
+@@ -0,0 +1,14 @@
++#ifdef FLAG_SECTION
++
++    {"close-sessions-on-ip-change",
++     "Close sessions on IP change",
++     "Option to close QUIC sessions on an IP address change, "
++     "when QUIC connection migration is not enabled.", kOsAll,
++     FEATURE_VALUE_TYPE(net::features::kCloseSessionsOnIpChange)},
++
++    {"migrate-sessions-on-network-change-v2",
++     "QUIC connection migration",
++     "Enable QUIC connection migration.", kOsAll,
++     FEATURE_VALUE_TYPE(net::features::kMigrateSessionsOnNetworkChangeV2)},
++
++#endif
+diff --git a/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc b/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
+@@ -0,0 +1,5 @@
++CROMITE_FEATURE(kCloseSessionsOnIpChange,
++                "CloseSessionsOnIpChange",
++                base::FEATURE_ENABLED_BY_DEFAULT);
++
++SET_CROMITE_FEATURE_DISABLED(kMigrateSessionsOnNetworkChangeV2);
+diff --git a/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc b/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
+@@ -0,0 +1,3 @@
++NET_EXPORT BASE_DECLARE_FEATURE(kCloseSessionsOnIpChange);
++
++NET_EXPORT BASE_DECLARE_FEATURE(kMigrateSessionsOnNetworkChangeV2);
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
++++ b/net/base/features.cc
+@@ -455,7 +455,7 @@ const base::FeatureParam<bool> kIpPrivacyCacheTokensByGeo{
+ // 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;
+--

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

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

build/patches/Customize-selection-popup.patch

@@ -9,23 +9,25 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../browser/ChromeActionModeHandler.java      |   4 +-
  .../chrome/browser/ChromeTabbedActivity.java  |  15 +-
+ ...ActivityTabWebContentsDelegateAndroid.java |  10 +-
  .../compositor/layouts/LayoutManagerImpl.java |   8 ++
+ .../tab/TabContextMenuItemDelegate.java       |   7 +-
  .../chrome/browser/ui/RootUiCoordinator.java  |   8 +-
  .../Customize-selection-popup.grdp            |  34 +++++
  .../res/xml/accessibility_preferences.xml     |  24 ++++
- .../selection/SelectActionMenuHelper.java     | 131 ++++++++++++------
+ .../selection/SelectActionMenuHelper.java     | 129 ++++++++++++------
  .../selection/SmartSelectionClient.java       |   4 +
- 8 files changed, 178 insertions(+), 50 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 {
+@@ -154,9 +154,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;
@@ -35,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -737,10 +737,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -736,10 +736,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
@@ -57,20 +59,45 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
                                  Toast.makeText(
                                                  ChromeTabbedActivity.this,
                                                  R.string.open_in_new_tab_toast,
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
+@@ -191,12 +191,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+         // Skip opening a new Tab if it doesn't make sense.
+         if (mTab.isClosing()) return false;
+ 
++        int tabLaunchType = TabLaunchType.FROM_LONGPRESS_FOREGROUND;
++        boolean selectionPopupTabsForeground =
++                    ContextUtils.getAppSharedPreferences().getBoolean(
++                        "selection_popup_tabs_foreground", false);
++        if (selectionPopupTabsForeground) {
++            tabLaunchType = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
++        }
++
+         // Creating new Tabs asynchronously requires starting a new Activity to create the Tab,
+         // so the Tab returned will always be null.  There's no way to know synchronously
+         // whether the Tab is created, so assume it's always successful.
+         boolean success =
+                 tabCreator.createTabWithWebContents(
+-                        mTab, webContents, TabLaunchType.FROM_LONGPRESS_FOREGROUND, url);
++                        mTab, webContents, tabLaunchType, url);
+ 
+         if (success) {
+             if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
-@@ -16,6 +16,7 @@ import android.view.ViewGroup;
- import androidx.annotation.Nullable;
+@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
  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;
-@@ -228,6 +229,13 @@ public class LayoutManagerImpl
-                                         && launchType != TabLaunchType.FROM_RECENT_TABS
+@@ -232,6 +233,13 @@ public class LayoutManagerImpl
                                          && launchType != TabLaunchType.FROM_RESTORE_TABS_UI
+                                         && launchType != TabLaunchType.FROM_SYNC_BACKGROUND
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);
 +                boolean selectionPopupTabsForeground =
 +                            ContextUtils.getAppSharedPreferences().getBoolean(
@@ -82,6 +109,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
                  float lastTapX = LocalizationUtils.isLayoutRtl() ? mHost.getWidth() * mPxToDp : 0.f;
                  float lastTapY = 0.f;
                  if (launchType != TabLaunchType.FROM_CHROME_UI) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
+@@ -344,8 +344,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
+         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
+         loadUrlParams.setReferrer(referrer);
++        @TabLaunchType int type = TabLaunchType.FROM_LONGPRESS_BACKGROUND;
++        if (ContextUtils.getAppSharedPreferences().getBoolean(
++                "selection_popup_tabs_foreground", false)) {
++            type = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
++        }
+         mTabModelSelector.openNewTab(
+-                loadUrlParams, TabLaunchType.FROM_LONGPRESS_BACKGROUND, mTab, isIncognito());
++                loadUrlParams, type, mTab, isIncognito());
+     }
+ 
+     /**
 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
@@ -91,9 +136,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.base.CallbackController;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.TraceEvent;
+ import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.ObservableSupplier;
-@@ -814,11 +815,16 @@ public class RootUiCoordinator
+@@ -850,11 +851,16 @@ public class RootUiCoordinator
                              TrackerFactory.getTrackerForProfile(tab.getProfile())
                                      .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  
@@ -153,11 +198,10 @@ 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
-@@ -63,4 +63,28 @@ found in the LICENSE file.
-         android:key="move_toolbar_bottom"
-         android:summary="@string/move_toolbar_bottom_summary"
-         android:title="@string/move_toolbar_bottom_title" />
-+
+@@ -73,4 +73,28 @@ found in the LICENSE file.
+         android:key="disable_toolbar_swipeup"
+         android:title="@string/disable_toolbar_swipe_up" />
+ 
 +    <PreferenceCategory
 +        android:key="customize_selecton_popup_section"
 +        android:title="@string/customize_selecton_popup_title" />
@@ -181,19 +225,20 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 +        android:key="selection_popup_smart_text"
 +        android:summary="@string/selection_popup_smart_text_summary"
 +        android:title="@string/selection_popup_smart_text_title" />
++
  </PreferenceScreen>
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
- 
+@@ -29,6 +29,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;
+@@ -55,38 +56,84 @@ import java.util.TreeSet;
  public class SelectActionMenuHelper {
      private static final String TAG = "SelectActionMenu"; // 20 char limit.
  
@@ -308,16 +353,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 {
+@@ -198,7 +245,7 @@ public class SelectActionMenuHelper {
          }
          SelectionMenuGroup primaryAssistGroup =
                  new SelectionMenuGroup(
@@ -326,7 +362,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 {
+@@ -224,7 +271,7 @@ public class SelectActionMenuHelper {
              String selectedText) {
          SelectionMenuGroup defaultGroup =
                  new SelectionMenuGroup(
@@ -335,16 +371,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.
+@@ -256,7 +303,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 =
+@@ -318,7 +365,7 @@ public class SelectActionMenuHelper {
          SelectionMenuGroup textProcessingItems =
                  new SelectionMenuGroup(
                          R.id.select_action_menu_text_processing_items,
@@ -353,7 +389,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
          if (isSelectionPassword || intentHandler == null) {
              addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
              return textProcessingItems;
-@@ -431,7 +478,7 @@ public class SelectActionMenuHelper {
+@@ -425,7 +472,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_cut)
                  .setIconAttr(android.R.attr.actionModeCutDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
@@ -362,7 +398,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -443,7 +490,7 @@ public class SelectActionMenuHelper {
+@@ -437,7 +484,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_copy)
                  .setIconAttr(android.R.attr.actionModeCopyDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
@@ -371,7 +407,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -455,7 +502,7 @@ public class SelectActionMenuHelper {
+@@ -449,7 +496,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_paste)
                  .setIconAttr(android.R.attr.actionModePasteDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
@@ -380,7 +416,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -469,7 +516,7 @@ public class SelectActionMenuHelper {
+@@ -463,7 +510,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)
@@ -389,7 +425,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -481,7 +528,7 @@ public class SelectActionMenuHelper {
+@@ -475,7 +522,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_select_all)
                  .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
@@ -398,7 +434,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -494,7 +541,7 @@ public class SelectActionMenuHelper {
+@@ -488,7 +535,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)
@@ -407,7 +443,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                          .setShowAsActionFlags(
                                  MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                          .setIsEnabled(isEnabled);
-@@ -514,7 +561,7 @@ public class SelectActionMenuHelper {
+@@ -508,7 +555,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)
@@ -424,17 +460,17 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
  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.content.browser.webcontents.WebContentsImpl;
+@@ -77,6 +78,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 =
+                 ((WebContentsImpl) webContents)
+                         .getOrSetUserData(SmartSelectionClient.class, SmartSelectionClient::new);
 --

build/patches/Deprecate-Data-URL-in-SVGUseElement.patch

@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3110,8 +3110,8 @@
+@@ -3534,8 +3534,8 @@
        status: "stable",
      },
      {

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

@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -289,8 +289,17 @@ class LocationBarMediator
+@@ -294,8 +294,17 @@ class LocationBarMediator
              if (mNativeInitialized) RecordUserAction.record("FocusLocation");
              // Don't clear Omnibox if the user just pasted text to NTP Omnibox.
              if (mShouldClearOmniboxOnFocus) {
@@ -58,15 +58,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import android.os.SystemClock;
  import android.text.Editable;
  import android.text.InputType;
-@@ -99,6 +100,7 @@ public abstract class UrlBar extends AutocompleteEditText {
-     private boolean mFocused;
+@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText {
      private boolean mAllowFocus = true;
+     private boolean mTypingStartedEventSent;
  
 +    private boolean mPendingSelectAll;
      private boolean mPendingScroll;
  
      // Captures the current intended text scroll type.
-@@ -294,6 +296,27 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -355,6 +357,27 @@ public class UrlBar extends AutocompleteEditText {
              mPendingScroll = false;
          }
          fixupTextDirection();

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

@@ -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.components.browser_ui.accessibility.TextScalePreference
+     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
          android:key="text_scale"
          android:title="@string/font_size"
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1112,6 +1112,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1079,6 +1079,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

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

@@ -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
+@@ -322,7 +322,7 @@ CSSSupportsParser::Result CSSSupportsParser::ConsumeBlinkFeatureFn(
+       stream.ConsumeUntilPeekedTypeIs<kRightParenthesisToken>();
+   return RuntimeEnabledFeatures::IsFeatureEnabledFromString(
+              feature_name_block.Peek().Value().Utf8())
+-             ? Result::kSupported
++             ? Result::kUnsupported
+              : Result::kUnsupported;
+ }
+ 
+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
+@@ -587,7 +587,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+     HeapVector<Member<StyleRule>> selectors;
+     HeapVector<CSSSelector> arena;
+     CSSPropertyValueSet* empty_properties =
+-        ImmutableCSSPropertyValueSet::Create(nullptr, 0, kUASheetMode);
++        ImmutableCSSPropertyValueSet::Create(nullptr, 0, kHTMLStandardMode);
+     CSSParserContext* css_parser_context =
+         MakeGarbageCollected<CSSParserContext>(*execution_context);
+     for (auto* raw_selector : raw_selectors) {
+--

build/patches/Disable-Component-Updates.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
 --- a/chrome/browser/component_updater/registration.cc
 +++ b/chrome/browser/component_updater/registration.cc
-@@ -99,6 +99,7 @@
+@@ -98,6 +98,7 @@
  namespace component_updater {
  
  void RegisterComponentsForUpdate() {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
 diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc
 --- a/components/component_updater/component_installer.cc
 +++ b/components/component_updater/component_installer.cc
-@@ -99,6 +99,7 @@ void ComponentInstaller::Register(
+@@ -103,6 +103,7 @@ void ComponentInstaller::Register(
      base::OnceClosure callback,
      const base::Version& registered_version,
      const base::Version& max_previous_product_version) {
@@ -34,7 +34,7 @@ diff --git a/components/component_updater/component_installer.cc b/components/co
 diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
 --- a/components/component_updater/component_updater_service.cc
 +++ b/components/component_updater/component_updater_service.cc
-@@ -539,7 +539,7 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
+@@ -546,7 +546,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.

build/patches/Disable-Compose-feature.patch

@@ -4,29 +4,28 @@ Subject: Disable Compose feature
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- components/compose/core/browser/compose_features.cc | 3 +++
+ components/compose/core/browser/compose_features.cc | 2 ++
  components/compose/features.gni                     | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
 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
-@@ -56,4 +56,7 @@ BASE_FEATURE(kComposeTextOutputAnimation,
- BASE_FEATURE(kComposeTextSelection,
-              "ComposeTextSelection",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+
+@@ -91,4 +91,6 @@ BASE_FEATURE(kEnableNudgeForUnspecifiedHint,
+ BASE_FEATURE(kEnableAdditionalTextMetrics,
+              "EnableAdditionalTextMetrics",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
 +SET_CROMITE_FEATURE_DISABLED(kComposeEligible);
  }  // namespace compose::features
 diff --git a/components/compose/features.gni b/components/compose/features.gni
 --- a/components/compose/features.gni
 +++ b/components/compose/features.gni
-@@ -4,5 +4,5 @@
+@@ -6,5 +6,5 @@ import("//build/config/chromeos/ui_mode.gni")
  
  declare_args() {
    # Whether Compose is enabled in the build.
--  enable_compose = is_mac || is_win || is_linux
+-  enable_compose = is_mac || is_win || is_linux || is_chromeos_ash
 +  enable_compose = false
  }
 --

build/patches/Disable-Compression-Dictionary-Transport.patch

@@ -10,25 +10,23 @@ 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
-@@ -651,16 +651,18 @@
+@@ -774,14 +774,16 @@
        }
      },
      {
 -      name: "CompressionDictionaryTransport",
 +      name: "CompressionDictionaryTransport", // need to be disabled
++      status: "experimental",
        base_feature: "none",
-       origin_trial_feature_name: "CompressionDictionaryTransportV2",
+       origin_trial_feature_name: "CompressionDictionaryTransportV3",
        origin_trial_allows_third_party: true,
        public: true,
-+      status: "experimental",
      },
      {
 -      name: "CompressionDictionaryTransportBackend",
 +      name: "CompressionDictionaryTransportBackend", // need to be disabled
++      status: "experimental",
        base_feature: "none",
        public: true,
-+      status: "experimental",
      },
-     {
-       name: "ComputedAccessibilityInfo",
 --

build/patches/Disable-FedCm.patch

@@ -5,9 +5,11 @@ Subject: Disable FedCm
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
+ .../third_party/blink/common/features_cc/Disable-FedCm.inc      | 1 +
  .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 3 files changed, 3 insertions(+), 1 deletion(-)
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
 
 diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 new file mode 100644
@@ -15,10 +17,16 @@ new file mode 100644
 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 @@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kFedCm);
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kFedCmWithStorageAccessAPI);
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1570,7 +1570,7 @@
+@@ -1739,7 +1739,7 @@
      {
        name: "FedCm",
        public: true,

build/patches/Disable-Feeback-Collector.patch

@@ -4,9 +4,28 @@ Subject: Disable Feeback Collector
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ chrome/browser/feedback/BUILD.gn              |  8 +++---
  .../browser/feedback/FeedbackCollector.java   | 28 ++-----------------
- 1 file changed, 3 insertions(+), 25 deletions(-)
+ 2 files changed, 7 insertions(+), 29 deletions(-)
 
+diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn
+--- a/chrome/browser/feedback/BUILD.gn
++++ b/chrome/browser/feedback/BUILD.gn
+@@ -15,10 +15,10 @@ source_set("feedback") {
+   public_deps = []
+   deps = []
+   if (is_android) {
+-    sources += [
+-      "android/family_info_feedback_source.cc",
+-      "android/family_info_feedback_source.h",
+-    ]
++    # sources += [
++    #   "android/family_info_feedback_source.cc",
++    #   "android/family_info_feedback_source.h",
++    # ]
+     public_deps += [
+       "//components/supervised_user/core/browser",
+       "//components/supervised_user/core/browser:fetcher",
 diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java

build/patches/Disable-FirstPartySets-and-StorageAccessAPI.patch

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

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

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

build/patches/Disable-GetInstalledRelatedApps-API.patch

@@ -4,11 +4,13 @@ Subject: Disable GetInstalledRelatedApps API
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../components/installedapp/InstalledAppProviderImpl.java       | 1 +
- content/browser/installedapp/installed_app_provider_impl_win.cc | 1 +
- .../content_features_cc/Disable-GetInstalledRelatedApps-API.inc | 2 ++
- .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 4 files changed, 5 insertions(+), 1 deletion(-)
+ .../components/installedapp/InstalledAppProviderImpl.java  | 1 +
+ .../browser/installedapp/installed_app_provider_impl.cc    | 2 +-
+ .../features_cc/Disable-GetInstalledRelatedApps-API.inc    | 7 +++++++
+ .../Disable-GetInstalledRelatedApps-API.inc                | 2 ++
+ .../blink/renderer/platform/runtime_enabled_features.json5 | 2 +-
+ 5 files changed, 12 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
 
 diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
@@ -22,17 +24,30 @@ diff --git a/components/installedapp/android/java/src/org/chromium/components/in
          GURL url = mRenderFrameHost.getLastCommittedURL();
          final GURL frameUrl = url == null ? GURL.emptyGURL() : url;
          int delayMillis = 0;
-diff --git a/content/browser/installedapp/installed_app_provider_impl_win.cc b/content/browser/installedapp/installed_app_provider_impl_win.cc
---- a/content/browser/installedapp/installed_app_provider_impl_win.cc
-+++ b/content/browser/installedapp/installed_app_provider_impl_win.cc
-@@ -112,6 +112,7 @@ void FilterInstalledAppsForWin(
-     std::vector<blink::mojom::RelatedApplicationPtr> related_apps,
-     blink::mojom::InstalledAppProvider::FilterInstalledAppsCallback callback,
-     const GURL frame_url) {
-+  CHECK(true);
-   ComPtr<ILauncherStatics4> launcher_statics;
-   HRESULT hr = base::win::RoActivateInstance(
-       base::win::ScopedHString::Create(RuntimeClass_Windows_System_Launcher)
+diff --git a/content/browser/installedapp/installed_app_provider_impl.cc b/content/browser/installedapp/installed_app_provider_impl.cc
+--- a/content/browser/installedapp/installed_app_provider_impl.cc
++++ b/content/browser/installedapp/installed_app_provider_impl.cc
+@@ -59,7 +59,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
+     const GURL& manifest_url,
+     FilterInstalledAppsCallback callback) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  if (!base::FeatureList::IsEnabled(features::kInstalledAppProvider)) {
++  if ((true)) {
+     base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
+         FROM_HERE,
+         base::BindOnce(std::move(callback),
+diff --git a/cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc b/cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
+@@ -0,0 +1,7 @@
++SET_CROMITE_FEATURE_DISABLED(kFilterInstalledAppsWebAppMatching);
++
++#if BUILDFLAG(IS_WIN)
++
++SET_CROMITE_FEATURE_DISABLED(kFilterInstalledAppsWinMatching);
++
++#endif
 diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc b/cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
 new file mode 100644
 --- /dev/null
@@ -43,7 +58,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2114,9 +2114,9 @@
+@@ -2424,9 +2424,9 @@
        status: {"Android": "test", "default": "stable"},
      },
      {

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

@@ -10,11 +10,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
-@@ -112,7 +112,7 @@ public class StartupPaintPreviewHelper {
-      * feature is not enabled this is effectively a no-op.
-      */
-     public static void setShouldShowOnRestore(boolean shouldShowOnRestore) {
--        sShouldShowOnRestore = shouldShowOnRestore;
+@@ -107,7 +107,7 @@ public class StartupPaintPreviewHelper {
+ 
+     /** Enables Paint Preview show attempt on restoration of a tab. */
+     public static void enableShowOnRestore() {
+-        sShouldShowOnRestore = true;
 +        sShouldShowOnRestore = false;
      }
  

build/patches/Disable-PrivacyGuide.patch

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

build/patches/Disable-PrivateStateTokens-API.patch

@@ -1,18 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 15 May 2023 12:33:18 +0000
-Subject: Disable PrivateStateTokens API
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
----
- .../public/cpp/features_cc/Disable-PrivateStateTokens-API.inc   | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc
-
-diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc
-new file mode 100644
---- /dev/null
-+++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-PrivateStateTokens-API.inc
-@@ -0,0 +1,2 @@
-+SET_CROMITE_FEATURE_DISABLED(kPrivateStateTokens);
-+SET_CROMITE_FEATURE_DISABLED(kFledgePst);
---

build/patches/Disable-Real-Box.patch

@@ -4,16 +4,16 @@ Subject: Disable Real Box
 
 Real-box is search box in ntp
 ---
- chrome/browser/prefs/browser_prefs.cc              | 2 +-
- chrome/browser/resources/new_tab_page/app.html     | 5 -----
- chrome/browser/ui/webui/realbox/realbox_handler.cc | 2 +-
- components/search/ntp_features.cc                  | 6 +++---
- 4 files changed, 5 insertions(+), 10 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc                  | 2 +-
+ chrome/browser/resources/new_tab_page/app.html         | 8 --------
+ chrome/browser/ui/webui/searchbox/searchbox_handler.cc | 1 +
+ components/search/ntp_features.cc                      | 6 +++---
+ 4 files changed, 5 insertions(+), 12 deletions(-)
 
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2072,7 +2072,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2170,7 +2170,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,51 +25,53 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
-@@ -504,11 +504,6 @@
-       hidden$="[[!logoEnabled_]]">
+@@ -16,14 +16,6 @@
+       ?hidden="${!this.logoEnabled_}">
    </ntp-logo>
    <div id="realboxContainer">
--    <ntp-realbox id="realbox" is-dark="[[theme_.isDark]]"
--        color-source-is-baseline="[[colorSourceIsBaseline]]"
--        on-open-lens-search="onOpenLensSearch_"
--        on-open-voice-search="onOpenVoiceSearch_" shown$="[[realboxShown_]]">
--    </ntp-realbox>
-     <template is="dom-if" if="[[showLensUploadDialog_]]" restamp>
+-    <cr-searchbox id="realbox" ?is-dark="${this.isThemeDark_()}"
+-        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
+-        @open-lens-search="${this.onOpenLensSearch_}"
+-        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
+-        ?had-secondary-side="${this.realboxHadSecondarySide}"
+-        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
+-        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}">
+-    </cr-searchbox>
+     ${this.showLensUploadDialog_ ? html`
        <ntp-lens-upload-dialog id="lensUploadDialog"
-           on-close-lens-search="onCloseLensSearch_">
-diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.cc b/chrome/browser/ui/webui/realbox/realbox_handler.cc
---- a/chrome/browser/ui/webui/realbox/realbox_handler.cc
-+++ b/chrome/browser/ui/webui/realbox/realbox_handler.cc
-@@ -672,7 +672,7 @@ void RealboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
- 
-   source->AddBoolean(
-       "realboxLensSearch",
--      profile->GetPrefs()->GetBoolean(prefs::kLensDesktopNTPSearchEnabled));
-+      false);
-   source->AddString("realboxLensVariations", GetBase64UrlVariations(profile));
-   source->AddBoolean(
-       "realboxLensDirectUpload",
+           @close-lens-search="${this.onCloseLensSearch_}">
+diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
+--- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
++++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
+@@ -457,6 +457,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+                                             Profile* profile,
+                                             bool enable_voice_search,
+                                             bool enable_lens_search) {
++  enable_lens_search = false;
+   // Embedders which are served from chrome-untrusted:// URLs should override
+   // this to false. The chrome.timeTicks capability that the metrics reporter
+   // depends on is not defined in chrome-untrusted environments and attempting
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -171,7 +171,7 @@ BASE_FEATURE(kNtpHandleMostVisitedNavigationExplicitly,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -161,7 +161,7 @@ BASE_FEATURE(kNtpHandleMostVisitedNavigationExplicitly,
  
  // If enabled, logo will be shown.
+ // This is a kill switch. Keep indefinitely.
 -BASE_FEATURE(kNtpLogo, "NtpLogo", base::FEATURE_ENABLED_BY_DEFAULT);
 +BASE_FEATURE(kNtpLogo, "NtpLogo", base::FEATURE_DISABLED_BY_DEFAULT);
  
- // If enabled, logo will fill up less vertical space.
- BASE_FEATURE(kNtpReducedLogoSpace,
-@@ -248,8 +248,8 @@ BASE_FEATURE(kNtpMostVisitedReflowOnOverflow,
- 
+ // If enabled, middle slot promo will be shown.
+ // This is a kill switch. Keep indefinitely.
+@@ -229,8 +229,8 @@ BASE_FEATURE(kNtpModulesRedesigned,
  // If enabled, OneGoogleBar will be shown.
+ // This is a kill switch. Keep indefinitely.
  BASE_FEATURE(kNtpOneGoogleBar,
 -             "NtpOneGoogleBar",
 -             base::FEATURE_ENABLED_BY_DEFAULT);
 +             "NtpOneGoogleBar",                   // disabled
 +             base::FEATURE_DISABLED_BY_DEFAULT);  // by default
  
- // If enabled, Google Photos module will be shown.
- BASE_FEATURE(kNtpPhotosModule,
+ // If enabled, outlook calendar module will be shown.
+ BASE_FEATURE(kNtpOutlookCalendarModule,
 --

build/patches/Disable-StartSurface-feature.patch

@@ -1,32 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 16 Nov 2022 11:18:07 +0100
-Subject: Disable StartSurface feature
-
-This feature would normally show a search box but leads to crashes.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../org/chromium/chrome/browser/flags/ChromeFeatureList.java    | 2 +-
- .../chrome_feature_list_cc/Disable-StartSurface-feature.inc     | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc
-
-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
-@@ -634,7 +634,7 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sSmallerTabStripTitleLimit =
-             newCachedFlag(SMALLER_TAB_STRIP_TITLE_LIMIT, false);
-     public static final CachedFlag sStartSurfaceAndroid =
--            newCachedFlag(START_SURFACE_ANDROID, true);
-+            newCachedFlag(START_SURFACE_ANDROID, false);
-     public static final CachedFlag sStartSurfaceOnTablet =
-             newCachedFlag(START_SURFACE_ON_TABLET, true);
-     public static final CachedFlag sStartSurfaceRefactor =
-diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc
-new file mode 100644
---- /dev/null
-+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-StartSurface-feature.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kStartSurfaceAndroid);
---

build/patches/Disable-TLS-resumption.patch

@@ -79,7 +79,7 @@ new file mode 100644
 diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 --- a/net/http/http_network_session.cc
 +++ b/net/http/http_network_session.cc
-@@ -208,6 +208,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
+@@ -211,6 +211,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
  
    next_protos_.push_back(kProtoHTTP11);
  
@@ -90,7 +90,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 --- a/net/quic/quic_session_pool.cc
 +++ b/net/quic/quic_session_pool.cc
-@@ -69,6 +69,7 @@
+@@ -80,6 +80,7 @@
  #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
  #include "net/traffic_annotation/network_traffic_annotation.h"
  #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -156,6 +157,38 @@ std::set<std::string> HostsFromOrigins(std::set<HostPortPair> origins) {
+@@ -246,6 +247,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log,
  
  }  // namespace
  
@@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
  
  QuicSessionRequest::~QuicSessionRequest() {
-@@ -1716,7 +1749,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -2039,7 +2072,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
                cert_verifier_, transport_security_state_, sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
                actual_network_anonymization_key),
@@ -149,7 +149,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
 --- a/net/socket/ssl_client_socket_impl.cc
 +++ b/net/socket/ssl_client_socket_impl.cc
-@@ -380,7 +380,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -292,7 +292,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
    CHECK(context_);
  }
  
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -764,6 +790,8 @@ int SSLClientSocketImpl::Init() {
+@@ -676,6 +702,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -192,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    }
  
    const int kBufferSize = GetDefaultOpenSSLBufferSize();
-@@ -1062,6 +1090,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -962,6 +990,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -228,7 +228,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
  
    // Measure TLS connections that implement the renegotiation_info extension.
-@@ -1699,6 +1756,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1594,6 +1651,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -240,7 +240,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
 --- a/net/socket/ssl_client_socket_impl.h
 +++ b/net/socket/ssl_client_socket_impl.h
-@@ -124,6 +124,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
+@@ -125,6 +125,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
    friend class SSLClientSocket;
    friend class SSLContext;
  

build/patches/Disable-WebGPU.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -586,6 +586,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -574,6 +574,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
      WebRuntimeFeatures::EnableV8IdleTasks(true);
    }
  
@@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -266,7 +266,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -265,7 +265,7 @@ BASE_FEATURE(kEnableDrDc,
  // enabled by default on supported platforms.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
      BUILDFLAG(IS_ANDROID)
@@ -36,12 +36,12 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
-@@ -376,6 +376,7 @@ ScriptPromise GPU::requestAdapter(ScriptState* script_state,
+@@ -378,6 +378,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
          "WebGPU is experimental on this platform. See "
          "https://github.com/gpuweb/gpuweb/wiki/"
          "Implementation-Status#implementation-status"));
 +    //(UAZO) add site setting
    }
  
-   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
+   auto* resolver =
 --

build/patches/Disable-add-to-home-screen-prompt.patch

@@ -1,26 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 28 Sep 2022 00:54:10 +0200
-Subject: Disable add to home screen prompt
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../AddToHomescreenMostVisitedTileClickObserver.java        | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
-@@ -48,11 +48,7 @@ public class AddToHomescreenMostVisitedTileClickObserver implements MostVisitedT
-                                     ntp.addMostVisitedTileClickObserver(
-                                             AddToHomescreenMostVisitedTileClickObserver.this);
-                                 } else {
--                                    // If it is a regular web page, and started from a most visited
--                                    // tile, show IPH.
--                                    if (url.getOrigin().equals(mLastClickedMostVisitedTileUrl)) {
--                                        addToHomescreenIPHController.showAddToHomescreenIPH(tab);
--                                    }
-+                                    // do not show any add to home screen IPH in Bromite
-                                     removeObserver(tab);
-                                 }
-                                 mLastClickedMostVisitedTileUrl = null;
---

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

@@ -5,43 +5,50 @@ Subject: Disable all predictors code
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/BUILD.gn                       |  2 --
- .../preloading_model_keyed_service.cc         |  1 +
- .../preloading_model_keyed_service_factory.cc |  4 +--
- .../chrome_hints_manager.cc                   |  1 +
- .../model_validator_keyed_service.cc          |  7 +++++-
- .../optimization_guide_keyed_service.cc       |  1 -
- .../predictors/loading_predictor_config.cc    |  4 +--
- .../browser/predictors/predictors_features.cc | 11 ++------
- chrome/browser/ui/tab_helpers.cc              |  1 -
- .../ui/webui/omnibox/omnibox_page_handler.cc  | 14 +++++++++++
- .../browser/autofill_optimization_guide.cc    |  5 ++--
- .../metrics/shadow_prediction_metrics.cc      |  2 +-
- .../browser/autocomplete_controller.cc        |  2 ++
- .../optimization_guide/core/hints_fetcher.cc  |  1 +
- .../optimization_guide/core/hints_manager.cc  |  5 ++++
- .../core/optimization_guide_features.cc       | 25 +++++++++++--------
- .../core/prediction_model_download_manager.cc |  6 +++--
- .../core/prediction_model_fetcher_impl.cc     |  1 +
- components/optimization_guide/features.gni    |  3 +--
- .../phishing_classifier.cc                    |  2 +-
- components/search/ntp_features.cc             |  3 +++
- .../Disable-all-predictors-code.inc           |  4 +++
- .../Disable-all-predictors-code.inc           |  7 ++++++
- .../Disable-all-predictors-code.inc           |  4 +++
- .../Disable-all-predictors-code.inc           |  2 ++
- .../document_speculation_rules.cc             |  1 +
- .../platform/runtime_enabled_features.json5   |  2 +-
- 27 files changed, 83 insertions(+), 38 deletions(-)
+ chrome/browser/BUILD.gn                           |  2 --
+ .../preloading_model_keyed_service.cc             |  3 +++
+ .../preloading_model_keyed_service_factory.cc     |  4 +---
+ .../optimization_guide/chrome_hints_manager.cc    |  1 +
+ .../model_validator_keyed_service.cc              |  6 +++++-
+ .../optimization_guide_keyed_service.cc           |  1 -
+ .../predictors/autocomplete_action_predictor.cc   |  2 ++
+ .../predictors/loading_predictor_config.cc        |  4 ++--
+ chrome/browser/predictors/predictors_features.cc  |  3 +--
+ chrome/browser/ui/tab_helpers.cc                  |  1 -
+ .../ui/webui/omnibox/omnibox_page_handler.cc      |  2 ++
+ chrome/utility/BUILD.gn                           |  2 +-
+ chrome/utility/services.cc                        |  8 --------
+ .../core/browser/autofill_optimization_guide.cc   |  5 +++--
+ .../omnibox/browser/autocomplete_controller.cc    |  4 ++++
+ .../optimization_guide/core/hints_fetcher.cc      |  1 +
+ .../optimization_guide/core/hints_manager.cc      |  5 +++++
+ .../core/optimization_guide_features.cc           | 15 +++++++++------
+ .../core/prediction_model_download_manager.cc     |  6 ++++--
+ .../core/prediction_model_fetcher_impl.cc         |  1 +
+ components/optimization_guide/features.gni        |  3 +--
+ .../core/page_content_annotations_features.cc     |  5 +++++
+ components/search/ntp_features.cc                 |  3 +++
+ .../Disable-all-predictors-code.inc               |  3 +++
+ .../Disable-all-predictors-code.inc               |  1 +
+ .../Disable-all-predictors-code.inc               |  1 +
+ .../features_cc/Disable-all-predictors-code.inc   |  4 ++++
+ .../features_cc/Disable-all-predictors-code.inc   |  1 +
+ .../features_cc/Disable-all-predictors-code.inc   |  2 ++
+ services/webnn/features.gni                       |  2 +-
+ .../document_speculation_rules.cc                 |  1 +
+ .../platform/runtime_enabled_features.json5       |  2 +-
+ 32 files changed, 69 insertions(+), 35 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
+ create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -851,8 +851,6 @@ static_library("browser") {
+@@ -785,8 +785,6 @@ static_library("browser") {
      "navigation_predictor/navigation_predictor_keyed_service_factory.h",
      "navigation_predictor/navigation_predictor_metrics_document_data.cc",
      "navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -53,7 +60,23 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
-@@ -16,6 +16,7 @@ PreloadingModelKeyedService::Inputs::Inputs() = default;
+@@ -11,6 +11,7 @@
+ #include "chrome/browser/navigation_predictor/preloading_model_handler.h"
+ #endif
+ 
++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+ namespace {
+ 
+ // The model takes all of its inputs as floats, so this is a convenience
+@@ -28,6 +29,7 @@ constexpr float ToInput(base::TimeDelta val) {
+ static_assert(1.0f == ToInput(true));
+ 
+ }  // namespace
++#endif
+ 
+ PreloadingModelKeyedService::Inputs::Inputs() = default;
+ PreloadingModelKeyedService::Inputs::Inputs(const Inputs& other) = default;
+@@ -37,6 +39,7 @@ PreloadingModelKeyedService::Inputs::operator=(const Inputs& other) = default;
  PreloadingModelKeyedService::PreloadingModelKeyedService(
      OptimizationGuideKeyedService* optimization_guide_keyed_service) {
  #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
@@ -87,15 +110,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
 diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 --- a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/model_validator_keyed_service.cc
-@@ -8,6 +8,7 @@
- #include "base/files/file_util.h"
- #include "base/task/sequenced_task_runner.h"
- #include "base/task/task_traits.h"
-+#include "base/task/thread_pool.h"
- #include "build/build_config.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/signin/identity_manager_factory.h"
-@@ -55,13 +56,13 @@ namespace optimization_guide {
+@@ -66,13 +66,13 @@ namespace optimization_guide {
  ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile)
      : profile_(profile) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -110,7 +125,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
    if (switches::ShouldValidateModel()) {
      // Create the validator object which will get destroyed when the model
      // load is complete.
-@@ -122,6 +123,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
+@@ -133,6 +133,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged(
  
  void ModelValidatorKeyedService::StartModelExecutionValidation() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -118,26 +133,26 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
    auto* opt_guide_service =
        OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
    if (!opt_guide_service) {
-@@ -139,6 +141,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
-       proto::ModelExecutionFeature::MODEL_EXECUTION_FEATURE_TEST, request,
+@@ -150,6 +151,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() {
+       ModelBasedCapabilityKey::kTest, request,
        base::BindOnce(&ModelValidatorKeyedService::OnModelExecuteResponse,
                       weak_ptr_factory_.GetWeakPtr()));
 +#endif
  }
  
  void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
-@@ -156,6 +159,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
+@@ -167,6 +169,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation(
  
  void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
-     std::unique_ptr<optimization_guide::proto::ComposeRequest> request) {
+     std::unique_ptr<optimization_guide::proto::ModelValidationInput> input) {
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    auto* opt_guide_service =
        OptimizationGuideKeyedServiceFactory::GetForProfile(profile_);
-@@ -168,6 +172,7 @@ void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation(
-       *request, base::RepeatingCallback(base::BindRepeating(
-                     &ModelValidatorKeyedService::OnDeviceModelExecuteResponse,
-                     weak_ptr_factory_.GetWeakPtr())));
+@@ -203,6 +206,7 @@ void ModelValidatorKeyedService::ExecuteModel(
+       base::RepeatingCallback(base::BindRepeating(
+           &ModelValidatorKeyedService::OnDeviceModelExecuteResponse,
+           weak_ptr_factory_.GetWeakPtr())));
 +#endif
  }
  
@@ -145,7 +160,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -528,7 +528,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -554,7 +554,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  void OptimizationGuideKeyedService::RegisterOptimizationTypes(
      const std::vector<optimization_guide::proto::OptimizationType>&
          optimization_types) {
@@ -153,6 +168,18 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
  }
  
  optimization_guide::OptimizationGuideDecision
+diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc
+--- a/chrome/browser/predictors/autocomplete_action_predictor.cc
++++ b/chrome/browser/predictors/autocomplete_action_predictor.cc
+@@ -209,6 +209,8 @@ void AutocompleteActionPredictor::StartPrerendering(
+ 
+   SetIsNavigationInDomainCallback(preloading_data);
+ 
++  if ((true)) return; // was kOmniboxTriggerForPrerender2
++
+   // Create new PreloadingAttempt and pass all the values corresponding to this
+   // prerendering attempt for Prerender.
+   content::PreloadingAttempt* preloading_attempt =
 diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/browser/predictors/loading_predictor_config.cc
 --- a/chrome/browser/predictors/loading_predictor_config.cc
 +++ b/chrome/browser/predictors/loading_predictor_config.cc
@@ -170,41 +197,20 @@ diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/brow
 diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/predictors/predictors_features.cc
 --- a/chrome/browser/predictors/predictors_features.cc
 +++ b/chrome/browser/predictors/predictors_features.cc
-@@ -39,11 +39,7 @@ BASE_FEATURE(kLoadingPredictorDisregardAlwaysAccessesNetwork,
+@@ -12,8 +12,7 @@ namespace features {
+ namespace {
  
- const base::FeatureState
-     kLoadingPredictorUseOptimizationGuideDefaultFeatureState =
--#if BUILDFLAG(IS_ANDROID)
--        base::FEATURE_ENABLED_BY_DEFAULT;
--#else
--        base::FEATURE_DISABLED_BY_DEFAULT;
--#endif
-+      base::FEATURE_DISABLED_BY_DEFAULT;
+ constexpr base::FeatureState kFeatureEnabledOnlyOnAndroid =
+-    BUILDFLAG(IS_ANDROID) ? base::FEATURE_ENABLED_BY_DEFAULT
+-                          : base::FEATURE_DISABLED_BY_DEFAULT;
++             base::FEATURE_DISABLED_BY_DEFAULT;
  
- // Modifies loading predictor so that it can also use predictions coming from
- // the optimization guide.
-@@ -52,11 +48,7 @@ BASE_FEATURE(kLoadingPredictorUseOptimizationGuide,
-              kLoadingPredictorUseOptimizationGuideDefaultFeatureState);
+ }  // namespace
  
- const base::FeatureState kLoadingPredictorPrefetchDefaultFeatureState =
--#if BUILDFLAG(IS_ANDROID)
--    base::FEATURE_ENABLED_BY_DEFAULT;
--#else
-     base::FEATURE_DISABLED_BY_DEFAULT;
--#endif
- 
- // Modifies loading predictor so that it does prefetches of subresources instead
- // of preconnects.
-@@ -103,4 +95,5 @@ size_t GetMaxInflightPrefetches() {
-       3));
- }
- 
-+SET_CROMITE_FEATURE_DISABLED(kLoadingPredictorUseLocalPredictions);
- }  // namespace features
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -414,7 +414,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -439,7 +439,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    }
    MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
    NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -215,66 +221,57 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
 --- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
 +++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
-@@ -39,7 +39,9 @@
- #include "components/omnibox/browser/autocomplete_match.h"
+@@ -40,7 +40,9 @@
  #include "components/omnibox/browser/autocomplete_provider.h"
  #include "components/omnibox/browser/autocomplete_result.h"
+ #include "components/omnibox/browser/omnibox_feature_configs.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- #include "components/omnibox/browser/autocomplete_scoring_model_service.h"
-+#endif
  #include "components/omnibox/browser/omnibox_field_trial.h"
++#endif
+ #include "components/optimization_guide/machine_learning_tflite_buildflags.h"
  #include "components/search_engines/template_url.h"
  #include "content/public/browser/web_ui.h"
-@@ -498,6 +500,7 @@ void OmniboxPageHandler::StartOmniboxQuery(const std::string& input_string,
+diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
+--- a/chrome/utility/BUILD.gn
++++ b/chrome/utility/BUILD.gn
+@@ -65,7 +65,7 @@ static_library("utility") {
+     "//printing/buildflags",
+     "//services/data_decoder:lib",
+     "//services/network:network_service",
+-    "//services/passage_embeddings:passage_embeddings",
++    # "//services/passage_embeddings:passage_embeddings",
+     "//services/passage_embeddings/public/mojom",
+     "//services/screen_ai/buildflags",
+     "//services/service_manager/public/cpp",
+diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
+--- a/chrome/utility/services.cc
++++ b/chrome/utility/services.cc
+@@ -246,13 +246,6 @@ auto RunMirroringService(
+       std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
  }
  
- void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) {
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-   if (auto* service = GetMlService()) {
-     auto version = service->GetModelVersion();
-     if (version == -1) {
-@@ -510,10 +513,14 @@ void OmniboxPageHandler::GetMlModelVersion(GetMlModelVersionCallback callback) {
-   } else {
-     std::move(callback).Run(-1);
-   }
-+#else
-+  std::move(callback).Run(-1);
-+#endif
- }
+-auto RunPassageEmbeddingsService(
+-    mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService>
+-        receiver) {
+-  return std::make_unique<passage_embeddings::PassageEmbeddingsService>(
+-      std::move(receiver));
+-}
+-
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
- void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals,
-                                  StartMlCallback callback) {
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-   if (auto* service = GetMlService()) {
-     AutocompleteMatch::ScoringSignals signals =
-         mojo::ConvertTo<AutocompleteMatch::ScoringSignals>(mojom_signals);
-@@ -523,6 +530,9 @@ void OmniboxPageHandler::StartMl(mojom::SignalsPtr mojom_signals,
-   } else {
-     std::move(callback).Run(-1);
-   }
-+#else
-+  std::move(callback).Run(-1);
-+#endif
- }
+ #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
+@@ -459,7 +452,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
+ #if !BUILDFLAG(IS_ANDROID)
+   services.Add(RunProfileImporter);
+   services.Add(RunMirroringService);
+-  services.Add(RunPassageEmbeddingsService);
+   services.Add(RunScreenAIServiceFactory);
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
- std::unique_ptr<AutocompleteController> OmniboxPageHandler::CreateController(
-@@ -547,8 +557,12 @@ OmniboxPageHandler::GetAutocompleteControllerType(
- }
- 
- AutocompleteScoringModelService* OmniboxPageHandler::GetMlService() {
-+#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-   return OmniboxFieldTrial::IsMlUrlScoringEnabled()
-              ? AutocompleteScoringModelServiceFactory::GetInstance()
-                    ->GetForProfile(profile_)
-              : nullptr;
-+#else
-+  return nullptr;
-+#endif
- }
 diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/components/autofill/core/browser/autofill_optimization_guide.cc
 --- a/components/autofill/core/browser/autofill_optimization_guide.cc
 +++ b/components/autofill/core/browser/autofill_optimization_guide.cc
-@@ -163,6 +163,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
+@@ -207,6 +207,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
    // If we do not have any optimization types to register, do not do anything.
    if (!optimization_types.empty()) {
      // Register all optimization types that we need based on `form_structure`.
@@ -282,8 +279,8 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
      decider_->RegisterOptimizationTypes(
          std::vector<optimization_guide::proto::OptimizationType>(
              std::move(optimization_types).extract()));
-@@ -214,7 +215,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
-     AutofillField* field) const {
+@@ -258,7 +259,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
+     const AutofillField* field) const {
    // If the field's storable type is `IBAN_VALUE`, check whether IBAN
    // suggestions should be blocked based on `url`.
 -  if (field->Type().GetStorableType() == IBAN_VALUE) {
@@ -291,47 +288,51 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
      optimization_guide::OptimizationGuideDecision decision =
          decider_->CanApplyOptimization(
              url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED,
-@@ -240,7 +241,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
-     const CreditCard* card) const {
+@@ -284,7 +285,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
+     const CreditCard& card) const {
    if (auto optimization_type =
-           GetVcnMerchantOptOutOptimizationTypeForCard(*card);
+           GetVcnMerchantOptOutOptimizationTypeForCard(card);
 -      optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) {
 +      decider_ && optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) {
      optimization_guide::OptimizationGuideDecision decision =
          decider_->CanApplyOptimization(url, optimization_type,
                                         /*optimization_metadata=*/nullptr);
-diff --git a/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc b/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
---- a/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
-+++ b/components/autofill/core/browser/metrics/shadow_prediction_metrics.cc
-@@ -74,7 +74,7 @@ void LogRegexShadowPredictions(const AutofillField& field) {
- 
- void LogMlShadowPredictions(const AutofillField& field) {
- #if !BUILDFLAG(BUILD_WITH_TFLITE_LIB)
--  return;
-+  if ((true)) return;
- #endif
-   if (!base::FeatureList::IsEnabled(features::kAutofillModelPredictions)) {
-     return;
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -47,7 +47,9 @@
+@@ -48,7 +48,9 @@
+ #include "components/omnibox/browser/autocomplete_input.h"
  #include "components/omnibox/browser/autocomplete_match_type.h"
  #include "components/omnibox/browser/autocomplete_provider.h"
- #include "components/omnibox/browser/autocomplete_provider_client.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
- #include "components/omnibox/browser/autocomplete_scoring_model_service.h"
+ #include "components/omnibox/browser/autocomplete_provider_client.h"
 +#endif
  #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
  #include "components/omnibox/browser/bookmark_provider.h"
  #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
+@@ -121,6 +123,7 @@ using ProviderType = AutocompleteProvider::Type;
+ 
+ constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
+ 
++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+ void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
+                            size_t total_scored_matches) {
+   int percent_score_coverage =
+@@ -229,6 +232,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
+   base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches",
+                                num_scored);
+ }
++#endif
+ 
+ // Appends available autocompletion of the given type, subtype, and number to
+ // the existing available autocompletions string, encoding according to the
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -183,6 +183,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -198,6 +198,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
      bool skip_cache,
      HintsFetchedCallback hints_fetched_callback,
-     proto::RequestContextMetadata* request_context_metadata) {
+     std::optional<proto::RequestContextMetadata> request_context_metadata) {
 +  if ((true)) return false;
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    DCHECK_GT(optimization_types.size(), 0u);
@@ -339,7 +340,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -390,6 +390,7 @@ void HintsManager::Shutdown() {
+@@ -393,6 +393,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -347,15 +348,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1110,6 +1111,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1116,6 +1117,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
      OnDemandOptimizationGuideDecisionRepeatingCallback callback,
-     proto::RequestContextMetadata* request_context_metadata) {
+     std::optional<proto::RequestContextMetadata> request_context_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +  if ((true)) return; // no consent on bromite
  
    InsertionOrderedSet<GURL> urls_to_fetch;
    InsertionOrderedSet<std::string> hosts_to_fetch;
-@@ -1416,6 +1418,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1421,6 +1423,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      bool skip_cache,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -368,16 +369,9 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
 diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
 --- a/components/optimization_guide/core/optimization_guide_features.cc
 +++ b/components/optimization_guide/core/optimization_guide_features.cc
-@@ -37,18 +37,10 @@ namespace features {
+@@ -39,11 +39,7 @@ namespace features {
  namespace {
  
- constexpr auto enabled_by_default_desktop_only =
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-     base::FEATURE_DISABLED_BY_DEFAULT;
--#else
--    base::FEATURE_ENABLED_BY_DEFAULT;
--#endif
- 
  constexpr auto enabled_by_default_mobile_only =
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
 -    base::FEATURE_ENABLED_BY_DEFAULT;
@@ -385,9 +379,9 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
      base::FEATURE_DISABLED_BY_DEFAULT;
 -#endif
  
- // Returns whether |locale| is a supported locale for |feature|.
- //
-@@ -575,8 +567,7 @@ size_t MaxURLKeyedHintCacheSize() {
+ }  // namespace
+ 
+@@ -423,8 +419,7 @@ size_t MaxURLKeyedHintCacheSize() {
  }
  
  bool ShouldPersistHintsToDisk() {
@@ -397,8 +391,8 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
  }
  
  RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
-@@ -1080,5 +1071,19 @@ bool GetOnDeviceModelRetractRepeats() {
-   return kOnDeviceModelRetractRepeats.Get();
+@@ -880,5 +875,13 @@ int GetOnDeviceModelValidationAttemptCount() {
+   return kParam.Get();
  }
  
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationHints);
@@ -406,21 +400,15 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 +SET_CROMITE_FEATURE_DISABLED(kRemoteOptimizationGuideFetchingAnonymousDataConsent);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationTargetPrediction);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideModelDownloading);
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
-+SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
-+SET_CROMITE_FEATURE_DISABLED(kPageEntitiesPageContentAnnotations);
 +SET_CROMITE_FEATURE_DISABLED(kPushNotifications);
-+SET_CROMITE_FEATURE_DISABLED(kPageVisibilityBatchAnnotations);
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
 +SET_CROMITE_FEATURE_DISABLED(kPreventLongRunningPredictionModels);
-+SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
 +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideFetchingForSRP);
  }  // namespace features
  }  // namespace optimization_guide
 diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc
 --- a/components/optimization_guide/core/prediction_model_download_manager.cc
 +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
-@@ -47,7 +47,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key";
+@@ -46,7 +46,7 @@ namespace {
  // we require models to come from.
  constexpr uint8_t kPublisherKeyHash[] = {
      0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
@@ -446,7 +434,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
    download::DownloadParams download_params;
    download_params.client =
        download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
-@@ -260,6 +261,7 @@ bool PredictionModelDownloadManager::VerifyDownload(
+@@ -264,6 +265,7 @@ bool PredictionModelDownloadManager::VerifyDownload(
      const base::FilePath& download_file_path,
      const base::FilePath& base_model_dir,
      bool delete_file_on_error) {
@@ -477,26 +465,27 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 +  build_with_tflite_lib = false
  }
  
- declare_args() {
-diff --git a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
---- a/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
-+++ b/components/safe_browsing/content/renderer/phishing_classifier/phishing_classifier.cc
-@@ -234,7 +234,7 @@ void PhishingClassifier::VisualExtractionFinished(bool success) {
-       *bitmap_, base::BindOnce(&PhishingClassifier::OnVisualTfLiteModelDone,
-                                weak_factory_.GetWeakPtr(), std::move(verdict)));
- #else
--  RunCallback(*verdict);
-+  //RunCallback(*verdict);
- #endif
+ if (is_ios) {
+diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
+--- a/components/page_content_annotations/core/page_content_annotations_features.cc
++++ b/components/page_content_annotations/core/page_content_annotations_features.cc
+@@ -280,4 +280,9 @@ size_t MaxRelatedSearchesCacheSize() {
+       "max_related_searches_cache_size", 10);
  }
  
++SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
++SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata);
++SET_CROMITE_FEATURE_DISABLED(kPageVisibilityBatchAnnotations);
++SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
++SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
+ }  // namespace page_content_annotations::features
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -544,4 +544,7 @@ std::vector<std::string> GetModulesOrder() {
-                            base::SplitResult::SPLIT_WANT_NONEMPTY);
+@@ -558,4 +558,7 @@ int GetWallpaperSearchButtonAnimationShownThreshold() {
+       kNtpWallpaperSearchButtonAnimationShownThreshold,
+       kNtpWallpaperSearchButtonAnimationShownThresholdParam, 15);
  }
- 
 +SET_CROMITE_FEATURE_DISABLED(kNtpHistoryClustersModule);
 +SET_CROMITE_FEATURE_DISABLED(kNtpHistoryClustersModuleLoad);
 +SET_CROMITE_FEATURE_DISABLED(kNtpHistoryClustersModuleUseModelRanking);
@@ -505,23 +494,22 @@ diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predic
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
-@@ -0,0 +1,4 @@
-+SET_CROMITE_FEATURE_DISABLED(kOmniboxTriggerForPrerender2);
+@@ -0,0 +1,3 @@
 +SET_CROMITE_FEATURE_DISABLED(kBookmarkTriggerForPrerender2);
 +SET_CROMITE_FEATURE_DISABLED(kNewTabPageTriggerForPrerender2);
 +SET_CROMITE_FEATURE_DISABLED(kSupportSearchSuggestionForPrerender2);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kNewTabPageAndroidTriggerForPrerender2);
 diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
-@@ -0,0 +1,7 @@
+@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kPrerenderFallbackToPreconnect);
-+
-+#if !BUILDFLAG(IS_ANDROID)
-+
-+SET_CROMITE_FEATURE_DISABLED(kSafetyCheckNotificationPermissions);
-+
-+#endif
 diff --git a/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -531,6 +519,12 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceNotificationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceGeolocationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2);
+diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kNetworkContextPrefetch);
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -538,21 +532,33 @@ new file mode 100644
 @@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kNavigationPredictor);
 +SET_CROMITE_FEATURE_DISABLED(kPreloadingHeuristicsMLModel);
+diff --git a/services/webnn/features.gni b/services/webnn/features.gni
+--- a/services/webnn/features.gni
++++ b/services/webnn/features.gni
+@@ -5,7 +5,7 @@
+ import("//build/config/features.gni")
+ 
+ declare_args() {
+-  webnn_use_tflite = is_android || is_chromeos || is_linux || is_win
++  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_win
+ 
+   # Enable logging of TFLite profiling information on MLGraph destruction.
+   webnn_enable_tflite_profiler = false
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
-@@ -599,6 +599,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
+@@ -645,6 +645,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
      return;
    }
  
 +  if ((true)) return;
    HeapVector<Member<SpeculationCandidate>> candidates;
-   auto push_candidates = [&candidates, &execution_context](
+   auto push_candidates = [&candidates, &document](
                               mojom::blink::SpeculationAction action,
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2961,7 +2961,7 @@
+@@ -3337,7 +3337,7 @@
        //
        // It also has some feature params defined throughout the codebase.
        name: "Prerender2",