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

[AUTO] Patches auto-rebase for master branch

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,14 @@
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }})
+
+{{ range .Commits -}}
+{{ if not (contains .Type "[") }}- {{.Hash.Short}} {{ .Subject }}
+{{ if not (eq (len .Body) 0) }}{{ .Body }}{{ end }}
+{{ range .Refs -}}
+{{ " " }} - #{{ .Ref }}
+{{ end }}
+{{ end }}
+{{ end }}
+
+{{ end -}}

.chglog/config.yml

@@ -0,0 +1,20 @@
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: https://github.com/uazo/cromite
+options:
+  commits:
+    filters:
+      Type:
+        - "[AUTO]"
+  commit_groups:
+    # title_maps: []
+  header:
+    pattern: "^(\\[.*\\])?(.*)$"
+    pattern_maps:
+      - Type
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,6 +22,8 @@ body:
           required: true
         - label: "I have searched the existing issues for my problem. This is a new ticket, NOT a duplicate or related to another open issue."
           required: true
+        - label: "I have read the [FAQs](https://github.com/uazo/cromite/blob/master/docs/FAQ.md)."
+          required: true
         - label: "I have updated Cromite to the latest version. The bug is reproducible on this latest version."
           required: true
         - label: "This is a bug report about the Cromite browser; not the website nor F-Droid nor anything else."
@@ -91,10 +93,11 @@ body:
       multiple: false
       description: What version of Android are you running?
       options:
+        - Android 15
         - Android 14
         - Android 13
         - Android 12.1
-        - Android 12.0
+        - Android 12
         - Android 11
         - Android 10
         - Android 9
@@ -148,7 +151,7 @@ body:
   - type: dropdown
     id: is_incognito
     attributes:
-      label: Is this bug happening in an incognito tab?
+      label: Is this bug happening ONLY in an incognito tab?
       multiple: false
       options:
         - "Yes"

.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
+          df -h
-          test -d /usr/local/lib/android && sudo rm -rf /usr/local/lib/android
+
-          test -d /opt/ghc && sudo rm -rf /opt/ghc
+          DIR=/usr/share/dotnet && sudo rm -rf $DIR
-          test -d /opt/hostedtoolcache/CodeQL && sudo rm -rf /opt/hostedtoolcache/CodeQL
+          DIR=/usr/local/lib/android && sudo rm -rf $DIR
+          DIR=/opt/ghc && sudo rm -rf $DIR
+          DIR=/opt/hostedtoolcache/CodeQL && sudo rm -rf $DIR
+          DIR=/usr/local/.ghcup && sudo rm -rf $DIR
+          DIR=/usr/lib/jvm && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/julia1.10.5 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/x86_64-linux-gnu && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/gcc && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-15 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-14 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/llvm-13 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/heroku && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/swift && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/miniconda && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/share/az_12.1.0 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/share/powershell && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/local/share/chromium && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/gcc && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-15 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-14 && test -d $DIR && sudo rm -rf $DIR
+          DIR=/usr/lib/llvm-13 && test -d $DIR && sudo rm -rf $DIR
+
           sudo apt-get remove google-cloud-cli azure-cli google-chrome-stable \
                        firefox mysql-server-core-8.0 mono-devel podman \
                        powershell || true
           sudo apt-get autoremove
 
+          df -h
+
       - name: Enable proxy on container
         shell: bash
-        if: ${{ github.event.inputs.type != 'ubuntu-latest' }}
+        if: ${{ github.event.inputs.type != '' && github.event.inputs.type != 'ubuntu-latest' }}
         run: |
           if ! [[ -z "${HTTP_PROXY}" ]]; then
             PROXY_ADDR=http://$(hostname -I | cut -d' ' -f1 | xargs):8118
@@ -82,12 +105,18 @@ jobs:
             echo "CHR_VERSION=$CHR_VERSION" >> $GITHUB_ENV
           fi
 
+      - name: Download regctl
+        shell: bash
+        run: |
+          curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl
+          chmod 755 regctl
+      
       - name: Building build-deps container ${{ env.VERSION }}
         shell: bash
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$CHR_VERSION \
                 --progress plain \
@@ -106,7 +135,7 @@ jobs:
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$CHR_VERSION \
                 --progress plain \
@@ -156,7 +185,7 @@ jobs:
           fi
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6.1.0
         if: env.CHANGES == '1'
         with:
           token: ${{ secrets.CROMITE_PULLS }}
@@ -180,8 +209,10 @@ jobs:
           cd cromite/tools
           echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
 
+          echo Custom Release $CHR_VERSION >body.txt
+
           if [[ "$LATEST_WIN" == "$CHR_VERSION" ]]; then
-             echo Using Windows Release >>body.txt
+             echo Using Windows Release >body.txt
              echo "\`\`\`" >>body.txt
              curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Windows&num=10&offset=0' | \
                  jq --arg LATEST "$LATEST_WIN" '.[] | select( .version == $LATEST )' >>body.txt
@@ -189,7 +220,7 @@ jobs:
           fi
 
           if [[ "$LATEST_ANDROID" == "$CHR_VERSION" ]]; then
-             echo Using Android Release >>body.txt
+             echo Using Android Release >body.txt
              echo "\`\`\`" >>body.txt
              curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Android&num=10&offset=0' | \
                  jq --arg LATEST "$LATEST_ANDROID" '.[] | select( .version == $LATEST )' >>body.txt

.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\" enable_trybot_verification=false " out/x64_webview
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/x64_webview/ --list --short
+          gn args out/x64_webview/ --list >out/x64_webview/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/x64_webview system_webview_apk system_webview_shell
+          cp ../../cromite/build/RELEASE out/x64_webview
+
+      - name: Build Cromite System WebView arm64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" target_cpu = \"arm64\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) system_webview_package_name=\"com.android.webview\" enable_trybot_verification=false " out/arm64_webview
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/arm64_webview/ --list --short
+          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/arm64_webview system_webview_apk system_webview_shell
+          cp ../../cromite/build/RELEASE out/arm64_webview
+
+      - name: Prepare Build Container for vanilla chromium
+        shell: bash
+        run: |
+          # set workspace paths
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          # checkout chromium commit
+          LAST_PATCH=$(git log --all --grep='Fix-chromium-vanilla.patch' --format="%H")
+          git checkout $LAST_PATCH
+
+      - name: Build Chromium Vanilla Android x64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"x64\" " out/chr_x64
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_x64/ --list --short
+          gn args out/chr_x64/ --list >out/chr_x64/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_x64 chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_x64
+
+      - name: Build Chromium Vanilla Android arm64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"arm64\" " out/chr_arm64
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_arm64/ --list --short
+          gn args out/chr_arm64/ --list >out/chr_arm64/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_arm64 chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_arm64
+
+      - name: Build Chromium Vanilla Android arm
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          cd $WORKSPACE/chromium/src
+
+          echo "::group::-------- gn gen"
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/chromium.gn_args) target_cpu = \"arm\" " out/chr_arm
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/chr_arm/ --list --short
+          gn args out/chr_arm/ --list >out/chr_arm/gn_list
+          echo "::endgroup::"
+
+          ninja -C out/chr_arm chrome_public_apk
+
+          cp ../../cromite/build/RELEASE out/chr_arm

.github/workflows/build_cromite.yaml

@@ -65,6 +65,12 @@ jobs:
             sudo iptables -D INPUT -p tcp --dport 8118 -j DROP
           fi
 
+      - name: Download regctl
+        shell: bash
+        run: |
+          curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl
+          chmod 755 regctl
+
       - name: Get current chromium version
         shell: bash
         run: |
@@ -80,7 +86,7 @@ jobs:
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$VERSION > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/build-deps:$VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/build-deps:$VERSION > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$VERSION \
                 --progress plain \
@@ -96,7 +102,7 @@ jobs:
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/chromium:$VERSION > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/chromium:$VERSION > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/chromium:$VERSION > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$VERSION \
                 --progress plain \
@@ -111,7 +117,7 @@ jobs:
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/cromite:$VERSION-$CROMITE_SHA --progress plain \
                 --build-arg CROMITE_SHA=$CROMITE_SHA \
@@ -126,7 +132,7 @@ jobs:
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
               DOCKER_BUILDKIT=1 docker build -t uazo/cromite-build:$VERSION-$CROMITE_SHA --progress plain \
                 --build-arg CROMITE_SHA=$CROMITE_SHA \
@@ -140,7 +146,7 @@ jobs:
       - name: Get uazo/cromite-build from docker hub if present
         shell: bash
         run: |
-          IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
+          IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
           if [ $IS_PRESENT -eq "0" ]; then
             docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA
           fi
@@ -172,9 +178,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/
+        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
-        WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
+        WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.22621.2428/Windows Kits/10/"
-        GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
+        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 }}

.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 }}

.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

@@ -17,11 +17,15 @@ on:
         description: 'draft? [true/false]'
         required: true
         default: 'false'
+      comment:
+        description: 'comment'
+        required: true
         
 env:
   CROMITE_SHA: ${{ github.event.inputs.sha }}
   REMOVEDOCKERSUPPORT: true
   USELOCALIMAGE: true
+  COMMENT: ${{ github.event.inputs.comment }}
 
 jobs:
   release:
@@ -48,9 +52,6 @@ jobs:
           BRANCH=$(curl https://github.com/uazo/cromite/branch_commits/$CROMITE_SHA | ./pup -p li.branch:last-child a text{} | xargs)
           echo "BRANCH=$BRANCH" >> $GITHUB_ENV
 
-          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
-          tar xfz gh_2.18.1_linux_amd64.tar.gz
-
       - name: Checkout 'uazo/cromite'
         uses: actions/checkout@v2
         with:
@@ -71,10 +72,7 @@ jobs:
 
           echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
 
-          echo "\`\`\`" >note
+          echo $COMMENT >note
-          # echo "this is not the official release of bromite but a test version." >>note
-          # echo "you can try it at your own risk." >>note
-          echo "\`\`\`" >>note
 
           $GH release create $VERSION-$CROMITE_SHA --notes-file note -d
 
@@ -140,7 +138,6 @@ jobs:
           cp $OUTPUTFILE_WIN/libEGL.dll chrome-win/
           cp $OUTPUTFILE_WIN/libGLESv2.dll chrome-win/
           cp $OUTPUTFILE_WIN/Logo.png chrome-win/
-          cp $OUTPUTFILE_WIN/mojo_core.dll chrome-win/
           cp $OUTPUTFILE_WIN/notification_helper.exe chrome-win/
           cp $OUTPUTFILE_WIN/resources.pak chrome-win/
           cp $OUTPUTFILE_WIN/SmallLogo.png chrome-win/
@@ -179,6 +176,7 @@ jobs:
           cp $OUTPUTFILE_LIN/snapshot_blob.bin chrome-lin/
           cp $OUTPUTFILE_LIN/xdg-mime chrome-lin/
           cp $OUTPUTFILE_LIN/xdg-settings chrome-lin/
+          cp $OUTPUTFILE_LIN/chrome_sandbox chrome-lin/
 
           tar -czvf chrome-lin64.tar.gz chrome-lin/
 

.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/SystemWebView.apk arm64_SystemWebView.apk
+          sudo chown runner arm64_SystemWebView.apk
+
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebViewShell.apk arm64_SystemWebViewShell.apk
+          sudo chown runner arm64_SystemWebViewShell.apk
+
+          echo Uploading arm64_SystemWebView
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebView.apk
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebViewShell.apk
+          echo "::endgroup::"
+
+          # android x64
+          echo "::group::-------- android systemwebview x64"
+          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebView.apk x64_SystemWebView.apk
+          sudo chown runner x64_SystemWebView.apk
+
+          sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebViewShell.apk x64_SystemWebViewShell.apk
+          sudo chown runner x64_SystemWebViewShell.apk
+
+          echo Uploading x64_SystemWebView
+          $GH release upload $VERSION-$CROMITE_SHA x64_SystemWebView.apk
+          $GH release upload $VERSION-$CROMITE_SHA x64_SystemWebViewShell.apk
+          echo "::endgroup::"
+
+          # vanilla chromium arm
+          echo "::group::-------- vanilla chromium arm"
+          sudo cp ${{ env.OUTPUTFILE_CHR_ARM }}/apks/ChromePublic.apk arm_VanillaChromium.apk
+          sudo chown runner arm_VanillaChromium.apk
+
+          echo Uploading arm_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA arm_VanillaChromium.apk
+          echo "::endgroup::"
+
+          # vanilla chromium arm64
+          echo "::group::-------- vanilla chromium arm64"
+          sudo cp ${{ env.OUTPUTFILE_CHR_ARM64 }}/apks/ChromePublic.apk arm64_VanillaChromium.apk
+          sudo chown runner arm64_VanillaChromium.apk
+
+          echo Uploading arm64_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA arm64_VanillaChromium.apk
+          echo "::endgroup::"
+
+          # vanilla chromium x64
+          echo "::group::-------- vanilla chromium x64"
+          sudo cp ${{ env.OUTPUTFILE_CHR_X64 }}/apks/ChromePublic.apk x64_VanillaChromium.apk
+          sudo chown runner x64_VanillaChromium.apk
+
+          echo Uploading x64_VanillaChromium
+          $GH release upload $VERSION-$CROMITE_SHA x64_VanillaChromium.apk
+          echo "::endgroup::"

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

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

.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, Oreo and above (Minimum v8.0, API level 26), Windows and Linux 64bit.
 
 # Goals
 
@@ -27,12 +27,13 @@ In addition, Cromite would like to promote greater integration with other non-pr
 
 # Privacy limitations
 
-Cromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases.
+Cromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases (better to use the desktop version).
 Please note that this project is not free of bugs and that changing the behaviour of a browser can be risky and not without problems.
 
 # Docs
 - [Privacy Policy](https://github.com/uazo/cromite/blob/master/docs/PRIVACY_POLICY.md)
 - [Features](https://github.com/uazo/cromite/blob/master/docs/FEATURES.md)
+- [Faqs](https://github.com/uazo/cromite/blob/master/docs/FAQ.md)
 - [How to build](https://github.com/uazo/cromite/blob/master/docs/HOW_TO_BUILD.md)
 - [Patch list](https://github.com/uazo/cromite/blob/master/docs/PATCHES.md)
 
@@ -40,16 +41,58 @@ Please note that this project is not free of bugs and that changing the behaviou
 
 All built versions are available as [releases](https://github.com/uazo/cromite/releases).
 
-Cromite is currently built for ARM64, x86 (Android SDK version 23+) and Windows x64.
+Cromite is currently built for ARM, ARM64, Android x86, Windows x64 and Linux.
 
-You will automatically receive notifications about new updates (and be able to install them) via the auto updater functionality (enabled by default), see [related wiki page](https://github.com/bromite/bromite/wiki/AutomaticUpdates).
+The following files will be present for each release:
+
+#### Cromite apk for android:
+- [arm64_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/arm64_ChromePublic.apk)
+- [arm_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/arm_ChromePublic.apk)
+- [x64_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/x64_ChromePublic.apk)
+
+#### Cromite System WebView apk for android:
+- [arm64_SystemWebView.apk](https://github.com/uazo/cromite/releases/latest/download/arm64_SystemWebView.apk)
+- [x64_SystemWebView.apk](https://github.com/uazo/cromite/releases/latest/download/x64_SystemWebView.apk)
+
+#### Linux package:
+- [chrome-lin64.tar.gz](https://github.com/uazo/cromite/releases/latest/download/chrome-lin64.tar.gz)
+
+#### Windows package:
+- [chrome-win.zip](https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip)
+
+#### Debugging symbols and proguard file for java stacktrace deobfuscation
+- x64_ChromePublic.apk.mapping
+- arm64_ChromePublic.apk.mapping
+- arm64_symbols.zip
+
+#### Build time analysis file:
+- arm64_ninja_log_trace.html
+
+#### Chrlauncher autoupdate file:
+- updateurl.txt
+
+Additional files are also available: please note that these files are created by an [additional build](https://github.com/uazo/cromite/actions/workflows/build_additional_targets.yaml) separate from the release process, and therefore may not be immediately available.
+
+#### Vanilla Chromium for android (used for tests):
+- arm64_VanillaChromium.apk
+- arm_VanillaChromium.apk
+- x64_VanillaChromium.apk
+
+#### SystemWebView Shell (used for tests)
+- arm64_SystemWebViewShell.apk
+- x64_SystemWebViewShell.apk
 
 ### F-droid
 
 Official F-droid repo url:
 https://www.cromite.org/fdroid/repo/?fingerprint=49F37E74DEE483DCA2B991334FB5A0200787430D0B5F9A783DD5F13695E9517B
 
-### Auto-update setup for windows
+### Auto-update in Android
+
+You will automatically receive notifications about new updates (and be able to install them) via the auto updater functionality.
+You will be asked whether you want to activate the functionality during the first start-up.
+
+### Auto-update setup for Windows
 
 1. Download https://github.com/henrypp/chrlauncher/releases
 2. Create a `chrlauncher.ini`
@@ -63,7 +106,7 @@ ChromiumUpdateUrl=https://github.com/uazo/cromite/releases/latest/download/updat
 # Command line for Chromium (string):
 # note --user-data-dir= works better if path is absolute
 # See here: http://peter.sh/experiments/chromium-command-line-switches/
-ChromiumCommandLine=--user-data-dir="C:\Users\<my user>\AppData\Local\Chromium\User Data" --no-default-browser-check
+ChromiumCommandLine=--user-data-dir="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,7 +129,7 @@ icacls . /grant "*S-1-15-2-2:(OI)(CI)(RX)"
 see https://github.com/uazo/bromite-buildtools/issues/51
 
 ### Enable AppContainer for renderer process in windows
-you can activate the 'RendererAppContainer' flag from the command line with
+you can activate (highly recommended) the 'RendererAppContainer' flag from the command line with
 ```
   --enable-features=RendererAppContainer
 ```
@@ -94,6 +137,29 @@ you can activate the 'RendererAppContainer' flag from the command line with
 ### Auto-update setup for linux
 working in progress in https://github.com/uazo/cromite/issues/771
 
+### Making Cromite work in Ubuntu 24.04 and its derivatives (kubuntu, etc)
+This happens because, starting with Ubuntu 24.04, Apparmor
+restricts the use of unprivileged user namespaces. To fix this, you have several options:
+#### 1. Creating an apparmor profile for cromite
+Create `/etc/apparmor.d/chrome`, and write:
+```
+abi <abi/4.0>,
+include <tunables/global>
+
+profile cromite /home/user/cromite/chrome-lin/chrome flags=(unconfined) {
+  userns,
+
+  include if exists <local/chrome>
+}
+```
+replacing the cromite binary path with where you have placed cromite.
+
+Now, run `sudo apparmor_parser -r /etc/apparmor.d/cromite` to apply the changes.
+#### 2. Disabling the restriction until next reboot
+`sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0`
+#### 3. Disabling the restriction permanently
+Add `kernel.apparmor_restrict_unprivileged_userns=0` to the file `/etc/sysctl.d/60-apparmor-namespace.conf`.  Create the file if not exists.
+
 # Contributing
 
 Please submit issues following the issue template; beware that GitHub does not display the templates from mobile.
@@ -117,6 +183,10 @@ For any usage or development discussion please use GitHub Discussions: https://g
 
 thanks to [austinhuang0131](https://github.com/austinhuang0131) for the svg icon
 
+# Donate
+
+If you want, you can donate to support cromite development through [paypal](https://www.paypal.com/pools/c/9cwNgAQhRL).
+
 # License
 
 Cromite is published under [GNU GPL v3](./LICENSE).

build/RELEASE

@@ -1 +1 @@
-125.0.6422.76
+133.0.6943.127

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"
@@ -120,7 +128,7 @@ if (target_os == "android") {
   cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")
 
   _is_debug_build = getenv("TARGET_ISDEBUG")
-  if(_is_debug_build == "true") {
+  if (_is_debug_build == "true") {
     # print("Debug build on")
     is_debug = true
     is_official_build = false
@@ -133,8 +141,8 @@ if (target_os == "android") {
   }
 
   if (build_webview) {
-    # only 64bit
+    # 32 and 64bit
-    skip_secondary_abi_for_cq = true
+    skip_secondary_abi_for_cq = false
   }
 }
 

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
@@ -20,8 +24,7 @@ Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
 disable-battery-status-updater.patch
 Battery-API-return-nothing.patch
-updater-disable-updater-pings.patch
+Disable-omission-of-URL-elements.patch
-Disable-omission-of-URL-elements-in-Omnibox.patch
 Modify-default-preferences.patch
 Do-not-store-passwords-by-default.patch
 Disable-NTP-remote-suggestions-by-default.patch
@@ -34,14 +37,10 @@ ungoogled-chromium-Disable-translate-integration.patch
 ungoogled-chromium-Disable-profile-avatar.patch
 ungoogled-chromium-Disable-intranet-detector.patch
 ungoogled-chromium-no-special-hosts-domains.patch
-ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
 Disable-all-promo-dialogs.patch
 Disable-update-scheduler.patch
 Add-search-engine.patch
-openH264-enable-ARM-ARM64-optimizations.patch
-build-remove-calling-untrusted-hooks.patch
-Inject-scripts-for-AMP-tracking-ads-and-video.patch
 Allow-playing-audio-in-background.patch
 Add-flag-to-control-video-playback-resume-feature.patch
 Add-exit-menu-item.patch
@@ -50,6 +49,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 +57,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 +68,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 +95,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
@@ -120,7 +116,6 @@ User-agent-customization.patch
 Add-AllowUserCertificates-flag.patch
 Add-IsCleartextPermitted-flag.patch
 Add-flag-for-omnibox-autocomplete-filtering.patch
-Revert-Delete-block-external-form-redirects.patch
 Add-flag-to-disable-external-intent-requests.patch
 Enable-share-intent.patch
 Logcat-crash-reports-UI.patch
@@ -128,7 +123,6 @@ Add-flag-to-disable-vibration.patch
 mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
 Client-hints-overrides.patch
 Allow-building-without-enable_reporting.patch
-Disable-lock-icon-in-address-bar-by-default.patch
 Experimental-user-scripts-support.patch
 Keep-empty-tabs-between-sessions.patch
 Disable-third-party-origin-trials.patch
@@ -171,18 +165,15 @@ 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
+Enable-HighEfficiencyMode-by-default.patch
-WIN-enable-file-system-access-blocklist.patch
 WIN-Disable-TabHoverCard-images.patch
 WIN-Fix-log-to-file.patch
 WIN-Disable-updater.patch
@@ -191,16 +182,13 @@ WIN-Add-some-prefs-to-secure-preferences.patch
 WIN-Disable-search-for-image.patch
 
 AudioBuffer-AnalyserNode-fp-mitigations.patch
-Disable-Component-Updates.patch
 add-browser-policy.patch
 Always-open-browser-controls-in-new-tab.patch
 Partitioning-all-cookies-by-top-frame-domain.patch
 Disable-FedCm.patch
 Disable-BackForwardCache.patch
-Evict-the-entire-FrameTree-like-desktop.patch
 Disable-visited-pseudo-class.patch
 Add-setting-to-clear-data-on-exit.patch
-WIN-Disable-sharing-hub.patch
 Improve-the-browser-sandbox.patch
 Disable-csp-reports.patch
 Fonts-fingerprinting-mitigation.patch
@@ -219,14 +207,11 @@ Clear-CORS-Preflight-Cache-on-clearing-data.patch
 Multi-Screen-Window-Placement-API-fix.patch
 Add-a-flag-to-disable-GamePad-API.patch
 Disable-WebGPU.patch
-Disable-FirstPartySets-and-StorageAccessAPI.patch
 Disable-GetInstalledRelatedApps-API.patch
 Disable-GSA-by-default.patch
-Disable-PrivateStateTokens-API.patch
 Disallowing-MIDI-permission-by-default.patch
 Disable-Compression-Dictionary-Transport.patch
 Disallow-Android-App-Scheme-as-referrer.patch
-Deprecate-Data-URL-in-SVGUseElement.patch
 Content-settings-infrastructure.patch
 Add-autoplay-site-setting.patch
 Site-setting-for-images.patch
@@ -252,13 +237,11 @@ Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch
 allow-the-download-of-clang-for-windows-crossbuild.patch
 Add-option-to-disable-snapshots.patch
 Enable-Android-Dynamic-Performance-Framework.patch
-Remove-GoogleAccountsPrivateApiHost.patch
 Fix-crash-on-customize-profile-ui.patch
 Enable-ImprovedBookmarks-by-default.patch
 Partition-MediaDeviceId-by-default.patch
 Keep-disabled-FetchLaterAPI.patch
 Disable-ranker-url-fetcher.patch
-Show-full-urls-for-bookmark.patch
 Disable-prefers-reduced-transparency-media-query.patch
 libjxl-0-8-2.patch
 Add-support-to-jxl.patch
@@ -267,7 +250,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
@@ -279,7 +261,6 @@ Enable-gwp-asan-on-Android.patch
 Disable-Read-Aloud-by-default.patch
 Disable-Compose-feature.patch
 Disable-offline-autofetch-flag.patch
-Enable-percent-based-scrolling-on-Windows.patch
 Show-NTP-at-startup.patch
 Enable-platform-aac-audio-and-h264-video.patch
 Disable-Paint-Preview-by-default.patch
@@ -289,17 +270,45 @@ 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
+Remove-sideloading-of-version-dll.patch
+Use-browser-navigation-handler.patch
+Cromite-Branding--improve-settings-ui.patch
+Disable-Posture-API.patch
+PublicKeyCredential-fingerprinting-mitigations.patch
+Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
+Enable-Cert-Management-UI.patch
+Enable-ProcessBoundStringEncryption-by-default.patch
+Prevent-mouse-wheel-fingerprinting-on-Windows.patch
 
+# temporary or wip patches
 Temp-PerformanceNavigationTiming-privacy-fix.patch
 Temp-disable-predictive-back-gesture.patch
 TEMP-Add-a-log-to-track-strange-behavior.patch
 Temp-guard-FileSystemAccessPersistentPermissions.patch
 Never-treat-Proguard-warnings-as-errors.patch
+Temp-disable-experimental-web-platform-features.patch
+Block-leakage-of-urls-in-sandbox-iframes.patch
 Fix-chromium-build-bugs.patch
+Enable-component-updater.patch
+Android-fonts-fingerprinting-mitigation.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

@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  base/android/android_image_reader_compat.cc      | 16 ++++++++++++++++
  base/android/android_image_reader_compat.h       | 14 ++++++++++++++
- chrome/browser/flag-metadata.json                |  6 +++---
+ chrome/browser/flag-metadata.json                |  4 ++++
  .../AImageReader-CFI-crash-mitigations.inc       |  4 ++++
  .../AImageReader-CFI-crash-mitigations.inc       |  1 +
  gpu/config/gpu_driver_bug_list.json              | 16 ++++++++++++++++
@@ -31,8 +31,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  gpu/config/gpu_util.cc                           |  8 ++++++++
  gpu/config/gpu_workaround_list.txt               |  1 +
  gpu/ipc/service/gpu_init.cc                      |  8 ++++++++
- gpu/ipc/service/stream_texture_android.cc        | 11 ++++++++++-
+ gpu/ipc/service/stream_texture_android.cc        | 10 +++++++++-
- 12 files changed, 87 insertions(+), 4 deletions(-)
+ 12 files changed, 87 insertions(+), 1 deletion(-)
  create mode 100644 cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
  create mode 100644 cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
 
@@ -90,13 +90,11 @@ 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
-@@ -3186,9 +3186,9 @@
+@@ -3219,6 +3219,10 @@
+     "name": "enable-identity-in-auth-error",
+     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
      "expiry_milestone": 135
-   },
++  },{
-   {
--    "name": "enable-image-reader",
--    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],
--    "expiry_milestone": 125
 +    "name": "enable-image-reader",          // Bromite: do not expire
 +    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],  // flag
 +    "expiry_milestone": -1
@@ -121,7 +119,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 @@
+@@ -2605,6 +2605,22 @@
          "no_downscaled_overlay_promotion"
        ]
      },
@@ -147,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
+@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_ANDROID)
@@ -162,18 +160,18 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 --- a/gpu/config/gpu_finch_features.h
 +++ b/gpu/config/gpu_finch_features.h
-@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
+@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
- // All features in alphabetical order. The features should be documented
+ GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);
- // alongside the definition of their values in the .cc file.
+ 
  #if BUILDFLAG(IS_ANDROID)
 +GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
  GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
  GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReader);
+ GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -124,6 +124,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !BUILDFLAG(IS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -183,9 +181,9 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -385,6 +388,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
-     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
+           kGpuFeatureStatusSoftware;
-         kGpuFeatureStatusBlocklisted;
+     }
    }
 +
 +  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
@@ -198,8 +196,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
+@@ -7,6 +7,7 @@ check_egl_fence_before_wait
- clear_pixel_unpack_buffer_before_copyteximage
+ check_ycbcr_studio_g22_left_p709_for_nv12_support
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
 +disable_aimagereader
@@ -217,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
  #endif
  
  #if BUILDFLAG(ENABLE_VULKAN)
-@@ -723,6 +724,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -716,6 +717,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -234,19 +232,11 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
 --- a/gpu/ipc/service/stream_texture_android.cc
 +++ b/gpu/ipc/service/stream_texture_android.cc
-@@ -6,6 +6,7 @@
+@@ -50,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
- 
- #include <string.h>
- 
-+#include "base/android/android_image_reader_compat.h"
- #include "base/android/scoped_hardware_buffer_fence_sync.h"
- #include "base/feature_list.h"
- #include "base/functional/bind.h"
-@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
  }
  
  TextureOwner::Mode GetTextureOwnerMode() {
--  return features::IsAImageReaderEnabled()
+-  return base::android::EnableAndroidImageReader()
 +  const bool a_image_reader_supported =
 +      base::android::AndroidImageReader::GetInstance().IsSupported();
 +
@@ -254,7 +244,7 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
 +  // AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2
 +  // flags into a single flag. Keeping the 2 flags separate for now since finch
 +  // experiment using this flag is in progress.
-+  return a_image_reader_supported && features::IsAImageReaderEnabled() &&
++  return a_image_reader_supported && base::android::EnableAndroidImageReader() &&
 +             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer)
               ? TextureOwner::Mode::kAImageReaderInsecure
               : TextureOwner::Mode::kSurfaceTextureInsecure;

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
-@@ -232,6 +232,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,10 +28,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -1078,6 +1079,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
          super.onStartWithNative();
-         ChromeActivitySessionTracker.getInstance().onStartWithNative();
+ 
-         ChromeCachedFlags.getInstance().cacheNativeFlags();
+         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
 +        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
 +                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);
  
@@ -40,42 +40,42 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -138,6 +138,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -169,6 +169,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
-     &feed::kFeedUserInteractionReliabilityReport,
 +    &kAllowUserCertificates,
+     &feed::kFeedRecyclerBinderUnmountOnDetach,
      &feed::kInterestFeedV2,
-     &feed::kInterestFeedV2Hearts,
      &feed::kWebFeedAwareness,
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -146,6 +146,7 @@ public abstract class ChromeFeatureList {
+@@ -157,6 +157,7 @@ public abstract class ChromeFeatureList {
+ 
+     // Feature names.
      /* 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 =
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
-             "AdaptiveButtonInTopToolbarTranslate";
+             "AdaptiveButtonInTopToolbarPageSummary";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_ADD_TO_BOOKMARKS =
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
-@@ -536,6 +537,8 @@ public abstract class ChromeFeatureList {
+@@ -616,6 +617,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidTabGroupStableIds =
+     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
-             newCachedFlag(ANDROID_TAB_GROUP_STABLE_IDS, false);
+             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
-     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, false);
+     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
-     public static final CachedFlag sArchiveTabService = newCachedFlag(ARCHIVE_TAB_SERVICE, false);
      public static final CachedFlag sAsyncNotificationManager =
-             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
+             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
-@@ -686,6 +689,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sBlockIntentsWhileLocked =
-     public static final List<CachedFlag> sFlagsCachedFullBrowser =
+@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {
+     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
              List.of(
-                     sAccountReauthenticationRecentTimeWindow,
-+                    sAllowUserCertificates,
                      sAndroidAppIntegration,
-                     sAndroidElegantTextHeight,
++                    sAllowUserCertificates,
-                     sAndroidHub,
+                     sAndroidAppIntegrationModule,
+                     sAndroidAppIntegrationV2,
+                     sNewTabPageCustomization,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null
@@ -111,7 +111,7 @@ new file mode 100644
 diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
 --- a/net/android/java/src/org/chromium/net/X509Util.java
 +++ b/net/android/java/src/org/chromium/net/X509Util.java
-@@ -525,6 +525,8 @@ public class X509Util {
+@@ -528,6 +528,8 @@ public class X509Util {
          return userRootBytes.toArray(new byte[0][]);
      }
  
@@ -120,7 +120,7 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j
      public static AndroidCertVerifyResult verifyServerCertificates(
              byte[][] certChain, String authType, String host)
              throws KeyStoreException, NoSuchAlgorithmException {
-@@ -613,6 +615,9 @@ public class X509Util {
+@@ -616,6 +618,9 @@ public class X509Util {
                  isIssuedByKnownRoot = isKnownRoot(root);
              }
  

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 {
+@@ -472,6 +472,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
-@@ -306,6 +306,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -372,6 +372,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
  

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -15,8 +15,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -91,6 +91,10 @@ BASE_FEATURE(kCollectAndroidFrameTimelineMetrics,
+@@ -114,6 +114,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
-              FEATURE_DISABLED_BY_DEFAULT);
+              FEATURE_ENABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
  
 +#if BUILDFLAG(IS_ANDROID)
@@ -29,7 +29,7 @@ diff --git a/base/features.cc b/base/features.cc
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -16,6 +16,7 @@
+@@ -22,6 +22,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

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

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

@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/java/res/values/values.xml     |   3 +
  .../java/res/xml/privacy_preferences.xml      |   4 +
  .../privacy/settings/PrivacySettings.java     |   1 +
- .../chrome_autocomplete_provider_client.cc    |   2 +
+ .../chrome_autocomplete_provider_client.cc    |   1 +
  chrome/browser/browser_resources.grd          |   3 +
  .../extensions/api/proxy/proxy_api_helpers.cc |   2 +-
  chrome/browser/net/proxy_service_factory.cc   |  24 +-
@@ -29,10 +29,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/resources/proxy_config.html    |  77 ++++
  chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
  chrome/browser/ui/BUILD.gn                    |   2 +
- .../webui/chrome_web_ui_controller_factory.cc |   3 +
+ .../browser/ui/webui/chrome_web_ui_configs.cc |   4 +
- 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/browser/ui/webui/proxy_config_ui.h     |  41 ++
- 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 +-
@@ -40,7 +40,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../proxy_config/proxy_policy_handler.cc      |   2 +-
  net/proxy_resolution/proxy_config.cc          |  51 ++-
  net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 980 insertions(+), 17 deletions(-)
+ 25 files changed, 984 insertions(+), 17 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -19,6 +19,9 @@ found in the LICENSE file.
+@@ -22,6 +22,9 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
@@ -77,30 +77,29 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -78,6 +78,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -82,6 +82,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     private static final String PREF_SAFE_BROWSING = "safe_browsing";
+     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
 +    private static final String PREF_PROXY_OPTIONS = "proxy";
      private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
      private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
-     private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
+     private static final String PREF_JAVASCRIPT_OPTIMIZER = "javascript_optimizer";
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -303,6 +303,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -333,6 +333,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
-   builtins_to_provide.push_back(
+   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
-       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
  #endif
-+  builtins_to_provide.push_back(
+   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
-+      base::ASCIIToUTF16(chrome::kChromeUIProxyConfigURL));
++  builtins_to_provide.push_back(chrome::kChromeUIProxyConfigURL16);
-   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUIVersionURL));
    return builtins_to_provide;
+ }
+ 
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -233,6 +233,9 @@
+@@ -231,6 +231,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(
+@@ -372,7 +372,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
          return std::nullopt;
        }
        return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -197,16 +196,16 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -191,6 +191,8 @@
+@@ -198,6 +198,8 @@
+ #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
- #include "services/screen_ai/buildflags/buildflags.h"
  
 +#include "chrome/browser/net/proxy_service_factory.h"
 +
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1523,6 +1525,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1714,6 +1716,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
-@@ -314,6 +314,8 @@ static_library("ui") {
+@@ -226,6 +226,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -670,31 +669,30 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
      "webui/net_internals/net_internals_ui.cc",
      "webui/net_internals/net_internals_ui.h",
      "webui/ntp_tiles_internals_ui.cc",
-diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
---- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
++++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -55,6 +55,7 @@
+@@ -55,6 +55,9 @@
- #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
+ #include "extensions/buildflags/buildflags.h"
- #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
+ #include "printing/buildflags/buildflags.h"
- #include "chrome/browser/ui/webui/policy/policy_ui.h"
+ 
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
- #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
++
- #include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
++
- #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
+ #if BUILDFLAG(ENABLE_NACL)
-@@ -455,6 +456,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+ #include "chrome/browser/ui/webui/nacl_ui.h"
-     return &NewWebUI<MetricsInternalsUI>;
+ #endif
-   if (url.host_piece() == chrome::kChromeUINetExportHost)
+@@ -401,4 +404,5 @@ void RegisterChromeWebUIConfigs() {
-     return &NewWebUI<NetExportUI>;
+ #if BUILDFLAG(ENABLE_GLIC)
-+  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
+   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
-+    return &NewWebUI<ProxyConfigUI>;
+ #endif
-   if (url.host_piece() == chrome::kChromeUINetInternalsHost)
++  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
-     return &NewWebUI<NetInternalsUI>;
+ }
-   if (url.host_piece() == chrome::kChromeUINTPTilesInternalsHost)
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,393 @@
+@@ -0,0 +1,389 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -756,7 +754,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 +791,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)
++ProxyConfigMessageHandler::ProxyConfigMessageHandler(Profile *profile) {
-+    :
-+      weak_ptr_factory_(this) {
 +
 +  // used to set new configuration preferences
 +  pref_service_ = g_browser_process->local_state();
@@ -896,7 +891,6 @@ new file mode 100644
 +      break;
 +    default:
 +     NOTREACHED();
-+     break;
 +  }
 +  state.SetByDottedPath("config.rules.type", base::Value(type));
 +  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));
@@ -978,7 +972,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 +1032,7 @@ new file mode 100644
 +    if (bypass_rules == nullptr)
 +      return;
 +
-+    absl::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
++    std::optional<bool> reverse_bypass = rules->FindBool("reverse_bypass");
 +
 +    proxyConfig.proxy_rules().bypass_rules.ParseFromString(*bypass_rules);
 +    proxyConfig.proxy_rules().reverse_bypass = reverse_bypass.value_or(false);
@@ -1092,7 +1086,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,41 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1113,7 +1107,9 @@ new file mode 100644
 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +
++#include "chrome/common/webui_url_constants.h"
 +#include "content/public/browser/web_ui_controller.h"
++#include "content/public/browser/webui_config.h"
 +
 +// The WebUI for chrome://proxy/.
 +class ProxyConfigUI : public content::WebUIController {
@@ -1123,20 +1119,19 @@ new file mode 100644
 +  explicit ProxyConfigUI(content::WebUI* web_ui);
 +};
 +
++class ProxyConfigUIConfig
++    : public content::DefaultWebUIConfig<ProxyConfigUI> {
++ public:
++  ProxyConfigUIConfig()
++      : DefaultWebUIConfig(content::kChromeUIScheme,
++                           chrome::kChromeUIProxyConfigHost) {}
++};
++
 +#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -49,6 +49,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+@@ -50,6 +50,7 @@ bool IsSystemWebUIHost(std::string_view host) {
- const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
- const char kChromeUIChromeSigninHost[] = "chrome-signin";
- const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
-+const char kChromeUIProxyConfigHost[] = "proxy";
-+const char kChromeUIProxyConfigURL[] = "chrome://proxy/";
- const char kChromeUIChromeURLsHost[] = "chrome-urls";
- const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
- const char kChromeUIComponentsHost[] = "components";
-@@ -464,6 +466,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
        kChromeUILockScreenNetworkHost,
        kChromeUILockScreenStartReauthHost,
        kChromeUIMobileSetupHost,
@@ -1144,30 +1139,30 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
        kChromeUIMultiDeviceSetupHost,
        kChromeUINetworkHost,
        kChromeUINotificationTesterHost,
-@@ -760,6 +763,7 @@ const char* const kChromeHostURLs[] = {
+@@ -71,6 +72,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
-@@ -135,6 +135,8 @@ extern const char kChromeUINTPTilesInternalsHost[];
+@@ -159,6 +159,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";
- extern const char kChromeUINaClHost[];
+ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
- extern const char kChromeUINetExportHost[];
+ inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
- extern const char kChromeUINetExportURL[];
+ inline constexpr char kChromeUINewTabHost[] = "newtab";
-+extern const char kChromeUIProxyConfigHost[];
++inline constexpr char16_t kChromeUIProxyConfigURL16[] = u"chrome://proxy/";
-+extern const char kChromeUIProxyConfigURL[];
++inline constexpr char kChromeUIProxyConfigHost[] = "proxy";
- extern const char kChromeUINetInternalsHost[];
+ inline constexpr char kChromeUINewTabPageHost[] = "new-tab-page";
- extern const char kChromeUINetInternalsURL[];
+ inline constexpr char kChromeUINewTabPageThirdPartyHost[] =
- extern const char kChromeUINewTabHost[];
+     "new-tab-page-third-party";
 diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
 --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
 +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
-@@ -244,14 +244,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
+@@ -253,14 +253,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
  // static
  void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
    registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
@@ -1184,7 +1179,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone
    registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false);
  }
  
-@@ -388,6 +388,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+@@ -405,6 +405,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
        if (proxy_dict.GetBypassList(&proxy_bypass)) {
          proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
        }
@@ -1321,7 +1316,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,
+@@ -380,7 +380,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
          set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
              server->GetString(), bypass_list && bypass_list->is_string()
                                       ? bypass_list->GetString()
@@ -1333,16 +1328,16 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -109,7 +109,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -129,7 +129,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
-                                    &single_proxies,
+             std::move(url_scheme), &single_proxies, ProxyServer::SCHEME_HTTP,
-                                    ProxyServer::SCHEME_HTTP);
+             allow_bracketed_proxy_chains, is_quic_allowed);
          type = Type::PROXY_LIST;
 -        return;
 +        continue;
        }
  
        // Trim whitespace off the url scheme.
-@@ -140,6 +140,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -160,6 +160,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
    }
  }
  
@@ -1397,14 +1392,14 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +
  const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
      const std::string& url_scheme) const {
-   const ProxyList* proxy_server_list = const_cast<ProxyRules*>(this)->
+   const ProxyList* proxy_server_list =
 diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h
 --- a/net/proxy_resolution/proxy_config.h
 +++ b/net/proxy_resolution/proxy_config.h
-@@ -103,6 +103,9 @@ class NET_EXPORT ProxyConfig {
+@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig {
-     //                                  and use socks4://foopy2 for all other
+     void ParseFromString(const std::string& proxy_rules,
-     //                                  URLs.
+                          bool allow_bracketed_proxy_chains = false,
-     void ParseFromString(const std::string& proxy_rules);
+                          bool is_quic_allowed = false);
 +    // Returns the proxy rules in a format that can be parsed by ParseFromString;
 +    // all information except bypass rules is used.
 +    std::string ToString() const;

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

@@ -291,15 +291,15 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
- #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h"
+ #include "third_party/blink/public/mojom/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() {
+@@ -337,6 +338,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
  }
  
  bool AutoplayPolicy::IsGestureNeededForPlayback() const {
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
    if (!IsLockedPendingUserGesture())
      return false;
  
-@@ -428,6 +431,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -449,6 +452,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
    }
  }
  
@@ -329,7 +329,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/third_party/blink/renderer/core/html/media/autoplay_policy.h
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.h
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.h
-@@ -142,6 +142,10 @@ class CORE_EXPORT AutoplayPolicy final
+@@ -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,29 +6,29 @@ 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.cc      | 277 +++++++++++++++++
- .../bookmarks/android/bookmark_bridge.h       |  30 +-
+ .../bookmarks/android/bookmark_bridge.h       |  29 +-
- .../browser/bookmarks/bookmark_html_writer.cc |  11 +
+ .../browser/bookmarks/bookmark_html_writer.cc |   3 +
  .../dialogs/DownloadLocationCustomView.java   |   8 +-
  .../DownloadLocationDialogCoordinator.java    |  10 +-
  .../flags/android/chrome_feature_list.cc      |   1 +
@@ -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, 900 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
@@ -149,19 +125,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
-@@ -21,6 +21,11 @@ import org.chromium.chrome.browser.profiles.Profile;
+@@ -25,6 +25,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.chrome.browser.profiles.ProfileProvider;
+ import org.chromium.ui.modaldialog.ModalDialogManager;
- import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
- import org.chromium.components.embedder_support.util.UrlConstants;
+ 
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.base.IntentRequestTracker;
 +
-+import org.chromium.ui.modaldialog.ModalDialogManager;
-+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
- 
  /**
   * The activity that displays the bookmark UI on the phone. It keeps a {@link
-@@ -33,6 +38,9 @@ public class BookmarkActivity extends SnackbarActivity {
+  * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should
+@@ -36,6 +39,9 @@ public class BookmarkActivity extends SnackbarActivity {
      public static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
      public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
  
@@ -171,14 +145,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
-@@ -58,8 +66,23 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -62,8 +68,25 @@ public class BookmarkActivity extends SnackbarActivity {
                  getOnBackPressedDispatcher(),
                  mBookmarkManagerCoordinator,
                  SecondaryActivity.BOOKMARK);
 +
 +        final boolean listenToActivityState = true;
 +        mIntentRequestTracker = IntentRequestTracker.createFromActivity(this);
-+        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker);
++        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState,
++                                                   mIntentRequestTracker, /*InsetObserver*/ null,
++                                                   /* trackOcclusion= */ true);
 +        mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState);
 +        mBookmarkManagerCoordinator.setWindow(mWindowAndroid,
 +                            new ModalDialogManager(
@@ -195,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onDestroy() {
          super.onDestroy();
-@@ -69,6 +92,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -73,6 +96,7 @@ public class BookmarkActivity extends SnackbarActivity {
      @Override
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
@@ -203,8 +179,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
          if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
              BookmarkId bookmarkId =
                      BookmarkId.getBookmarkIdFromString(
-@@ -77,6 +101,14 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -86,6 +110,14 @@ public class BookmarkActivity extends SnackbarActivity {
-         }
+         return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP);
      }
  
 +    @Override
@@ -270,10 +246,43 @@ 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.
-@@ -505,6 +547,212 @@ class BookmarkBridge {
+@@ -490,6 +532,245 @@ class BookmarkBridge {
                  .getTotalBookmarkCount(mNativeBookmarkBridge, id.getId(), id.getType());
      }
  
++    @CalledByNative
++    public void bookmarksExported(WindowAndroid window, String bookmarksPath, boolean success) {
++        Uri uri = Uri.parse(bookmarksPath);
++
++        if (success == false) {
++            ((Activity)window.getContext().get()).runOnUiThread(new Runnable() {
++                public void run() {
++                    window.showError(R.string.saving_file_error);
++                }
++            });
++        } else {
++            SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance();
++            sharedPrefs.writeString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, bookmarksPath);
++
++            Context context = ContextUtils.getApplicationContext();
++
++            Intent intent = new Intent(Intent.ACTION_VIEW,
++                ContentUriUtils.isContentUri(bookmarksPath) ?
++                    Uri.parse(bookmarksPath) : Uri.parse("file://" + bookmarksPath));
++            intent.putExtra(Browser.EXTRA_APPLICATION_ID,
++                            context.getPackageName());
++            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
++            intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK);
++
++            // If the bookmark manager is shown in a tab on a phone (rather than in a separate
++            // activity) the component name may be null. Send the intent through
++            // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012.
++            intent.setClass(context, ChromeLauncherActivity.class);
++
++            IntentHandler.startActivityForTrustedIntent(intent);
++        }
++    }
++
 +    /**
 +     * Import bookmarks from a selected file.
 +     * @param window The current window of the bookmarks activity or page.
@@ -483,47 +492,7 @@ 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.
       *
-@@ -1063,6 +1311,39 @@ class BookmarkBridge {
+@@ -1102,6 +1383,10 @@ class BookmarkBridge {
-         BookmarkUtils.clearLastUsedPrefs();
-     }
- 
-+    @CalledByNative
-+    public void bookmarksExported(WindowAndroid window, String bookmarksPath, boolean success) {
-+        Uri uri = Uri.parse(bookmarksPath);
-+
-+        if (success == false) {
-+            ((Activity)window.getContext().get()).runOnUiThread(new Runnable() {
-+                public void run() {
-+                    window.showError(R.string.saving_file_error);
-+                }
-+            });
-+        } else {
-+            SharedPreferencesManager sharedPrefs = ChromeSharedPreferences.getInstance();
-+            sharedPrefs.writeString(ChromePreferenceKeys.BOOKMARKS_LAST_EXPORT_URI, bookmarksPath);
-+
-+            Context context = ContextUtils.getApplicationContext();
-+
-+            Intent intent = new Intent(Intent.ACTION_VIEW,
-+                ContentUriUtils.isContentUri(bookmarksPath) ?
-+                    Uri.parse(bookmarksPath) : Uri.parse("file://" + bookmarksPath));
-+            intent.putExtra(Browser.EXTRA_APPLICATION_ID,
-+                            context.getPackageName());
-+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-+            intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK);
-+
-+            // If the bookmark manager is shown in a tab on a phone (rather than in a separate
-+            // activity) the component name may be null. Send the intent through
-+            // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012.
-+            intent.setClass(context, ChromeLauncherActivity.class);
-+
-+            IntentHandler.startActivityForTrustedIntent(intent);
-+        }
-+    }
-+
-     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
-         List<Pair<Integer, Integer>> pairList = new ArrayList<>();
-         for (int i = 0; i < left.length; i++) {
-@@ -1131,6 +1412,10 @@ class BookmarkBridge {
          void getChildIds(
                  long nativeBookmarkBridge, long id, int type, List<BookmarkId> bookmarksList);
  
@@ -537,7 +506,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/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
-@@ -66,6 +66,16 @@ public interface BookmarkDelegate {
+@@ -65,6 +65,16 @@ public interface BookmarkDelegate {
      /** Shows the search UI. */
      void openSearchUi();
  
@@ -557,7 +526,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;
+@@ -54,6 +54,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 +535,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
+@@ -334,6 +336,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -583,16 +552,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -54,6 +54,8 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+@@ -59,6 +59,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
- import org.chromium.components.commerce.core.CommerceSubscription;
+ import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.components.commerce.core.ShoppingService;
+ import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
- import org.chromium.components.commerce.core.SubscriptionsObserver;
+ import org.chromium.components.power_bookmarks.PowerBookmarkType;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
- import org.chromium.components.favicon.LargeIconBridge;
+ import org.chromium.ui.accessibility.AccessibilityState;
- import org.chromium.components.feature_engagement.EventConstants;
+ import org.chromium.ui.listmenu.ListMenu;
- import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
+ import org.chromium.ui.listmenu.ListMenuItemProperties;
-@@ -83,6 +85,9 @@ class BookmarkManagerMediator
+@@ -85,6 +87,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -602,7 +571,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;
-@@ -606,6 +611,14 @@ class BookmarkManagerMediator
+@@ -571,6 +576,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -617,7 +586,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.
-@@ -786,6 +799,16 @@ class BookmarkManagerMediator
+@@ -752,6 +765,16 @@ class BookmarkManagerMediator
          }
      }
  
@@ -656,20 +625,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          super(host);
  
          mBookmarkManagerCoordinator =
-@@ -43,6 +46,9 @@ public class BookmarkPage extends BasicNativePage {
+@@ -44,6 +47,9 @@ public class BookmarkPage extends BasicNativePage {
-                         profile,
+                         new BookmarkUiPrefs(ChromeSharedPreferences.getInstance()),
-                         new BookmarkUiPrefs(ChromeSharedPreferences.getInstance()));
+                         /* bookmarkOpenedCallback= */ null);
          mBookmarkManagerCoordinator.setBasicNativePage(this);
 +        mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(),
 +                           new ModalDialogManager(
 +                                new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP));
-         mTitle = host.getContext().getResources().getString(R.string.bookmarks);
+         mTitle = host.getContext().getString(R.string.bookmarks);
  
          initWithView(mBookmarkManagerCoordinator.getView());
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- 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>
+@@ -98,6 +98,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
          setOnMenuItemClickListener(dragEnabled ? null : this);
      }
  
@@ -684,19 +653,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mExportBookmarkRunnable = runnable;
 +    }
 +
-     void setSearchButtonVisible(boolean visible) {
+     void setEditButtonVisible(boolean visible) {
-         // The improved bookmarks experience embeds search in the list.
+         mEditButtonVisible = visible;
-         if (BookmarkFeatures.isAndroidImprovedBookmarksEnabled()) return;
+         getMenu().findItem(R.id.edit_menu_id).setVisible(visible);
-@@ -173,6 +184,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -174,6 +185,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>
+@@ -193,6 +211,13 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      @Override
      public boolean onMenuItemClick(MenuItem menuItem) {
          hideOverflowMenu();
@@ -710,7 +684,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>
+@@ -208,6 +233,9 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      protected void showNormalView() {
          super.showNormalView();
  
@@ -718,12 +692,12 @@ 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
-@@ -131,6 +131,10 @@ class BookmarkToolbarMediator
+@@ -132,6 +132,10 @@ class BookmarkToolbarMediator
                      mBookmarkDelegate = bookmarkDelegate;
                      mModel.set(
                              BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE, this::onNavigateBack);
@@ -737,7 +711,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 {
+@@ -78,6 +78,10 @@ class BookmarkToolbarProperties {
  
      static final WritableObjectPropertyKey<Runnable> NAVIGATE_BACK_RUNNABLE =
              new WritableObjectPropertyKey<>();
@@ -747,13 +721,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +            new WritableObjectPropertyKey<>();
  
      static final PropertyKey[] ALL_KEYS = {
-         BOOKMARK_MODEL,
+         SELECTION_DELEGATE,
-@@ -91,6 +95,8 @@ class BookmarkToolbarProperties {
+@@ -105,6 +109,8 @@ class BookmarkToolbarProperties {
-         CHECKED_VIEW_MENU_ID,
+         SELECTION_MODE_SHOW_OPEN_IN_INCOGNITO,
-         MENU_ID_CLICKED_FUNCTION,
+         SELECTION_MODE_SHOW_MOVE,
-         NAVIGATE_BACK_RUNNABLE,
+         SELECTION_MODE_SHOW_MARK_READ,
--        FAKE_SELECTION_STATE_CHANGE
+-        SELECTION_MODE_SHOW_MARK_UNREAD
-+        FAKE_SELECTION_STATE_CHANGE,
++        SELECTION_MODE_SHOW_MARK_UNREAD,
 +        IMPORT_BOOKMARK_RUNNABLE,
 +        EXPORT_BOOKMARK_RUNNABLE
      };
@@ -761,7 +735,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 {
+@@ -54,6 +54,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 +751,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;
+@@ -18,6 +18,7 @@ import org.chromium.base.supplier.ObservableSupplier;
- 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;
-@@ -56,7 +57,7 @@ import org.chromium.ui.util.ColorUtils;
+@@ -58,7 +59,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,7 +768,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
      private final BottomSheetController mBottomSheetController;
      private final BrowserControlsManager mBrowserControlsManager;
      private final Supplier<Tab> mCurrentTabSupplier;
-@@ -77,7 +78,7 @@ public class NativePageFactory {
+@@ -80,7 +81,7 @@ public class NativePageFactory {
      private static NativePage sTestPage;
  
      public NativePageFactory(
@@ -803,7 +777,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,
-@@ -143,7 +144,7 @@ public class NativePageFactory {
+@@ -149,7 +150,7 @@ public class NativePageFactory {
  
      @VisibleForTesting
      static class NativePageBuilder {
@@ -812,8 +786,8 @@ 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;
-@@ -161,7 +162,7 @@ public class NativePageFactory {
+@@ -168,7 +169,7 @@ public class NativePageFactory {
-         private final OneshotSupplier<ModuleRegistry> mModuleRegistrySupplier;
+         private final ObservableSupplier<EdgeToEdgeController> mEdgeToEdgeControllerSupplier;
  
          public NativePageBuilder(
 -                Activity activity,
@@ -821,7 +795,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
                  Supplier<NewTabPageUma> uma,
                  BottomSheetController sheetController,
                  BrowserControlsManager browserControlsManager,
-@@ -231,7 +232,7 @@ public class NativePageFactory {
+@@ -242,7 +243,7 @@ public class NativePageFactory {
                      mActivity.getComponentName(),
                      mSnackbarManagerSupplier.get(),
                      tab.getProfile(),
@@ -833,7 +807,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -203,6 +203,8 @@ static_library("browser") {
+@@ -207,6 +207,8 @@ static_library("browser") {
      "bluetooth/chrome_bluetooth_delegate_impl_client.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -842,9 +816,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",
-@@ -1979,6 +1981,13 @@ static_library("browser") {
+@@ -1661,6 +1663,13 @@ static_library("browser") {
-     ]
+     "webid/identity_provider_permission_request.h",
-   }
+   ]
  
 +  if (is_android) {
 +    sources += [
@@ -856,19 +830,19 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3711,8 +3720,6 @@ static_library("browser") {
+@@ -3475,8 +3484,6 @@ static_library("browser") {
-       "badging/badge_manager_factory.h",
+       "bookmarks/bookmark_expanded_state_tracker.h",
-       "banners/app_banner_manager_desktop.cc",
+       "bookmarks/bookmark_expanded_state_tracker_factory.cc",
-       "banners/app_banner_manager_desktop.h",
+       "bookmarks/bookmark_expanded_state_tracker_factory.h",
 -      "bookmarks/bookmark_html_writer.cc",
 -      "bookmarks/bookmark_html_writer.h",
-       "bookmarks/url_and_id.h",
+       "bookmarks/bookmark_merged_surface_service.cc",
-       "cart/cart_db.cc",
+       "bookmarks/bookmark_merged_surface_service.h",
-       "cart/cart_db.h",
+       "bookmarks/bookmark_merged_surface_service_factory.cc",
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -61,6 +61,28 @@
+@@ -64,6 +64,28 @@
  #include "content/public/browser/web_contents.h"
  #include "url/gurl.h"
  
@@ -894,10 +868,10 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +#include "ui/shell_dialogs/selected_file_info.h"
 +#include "ui/shell_dialogs/select_file_dialog.h"
 +
- // Must come after other includes, because FromJniType() uses Profile.
+ // Must come after all headers that specialize FromJniType() / ToJniType().
  #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h"
  
-@@ -79,12 +101,96 @@ using bookmarks::android::JavaBookmarkIdGetType;
+@@ -82,12 +104,97 @@ using bookmarks::android::JavaBookmarkIdGetType;
  using content::BrowserThread;
  using power_bookmarks::PowerBookmarkMeta;
  
@@ -929,14 +903,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) {
++    const base::span<const base::cstring_view> hosts = chrome::ChromeURLHosts();
-+      if (fixed_url.DomainIs(chrome::kChromeHostURLs[i]))
++    for (const base::cstring_view host : hosts) {
++      if (fixed_url.DomainIs(host)) {
 +        return true;
++      }
 +    }
 +
-+    for (size_t i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
++    if (base::Contains(chrome::ChromeDebugURLs(), fixed_url)) {
-+      if (fixed_url == chrome::kChromeDebugURLs[i])
++      return true;
-+        return true;
 +    }
 +
 +    // If url has either chrome:// or about: schemes but wasn't found in the
@@ -994,7 +969,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  class BookmarkTitleComparer {
   public:
    explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -240,6 +346,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -229,6 +336,10 @@ BookmarkBridge::~BookmarkBridge() {
    partner_bookmarks_shim_observation_.Reset();
    bookmark_model_observation_.Reset();
    profile_observation_.Reset();
@@ -1005,7 +980,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -809,6 +919,183 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -768,6 +879,172 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -1026,10 +1001,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" };
-+
++  select_file_dialog_->SetAcceptTypes(v_accept_types);
-+  // 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_->SelectFile(
 +        ui::SelectFileDialog::SELECT_OPEN_FILE,
@@ -1038,8 +1010,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +        &file_type_info,
 +        0,
 +        base::FilePath::StringType(),
-+        window,
++        window
-+        &accept_types
 +  );
 +}
 +
@@ -1087,8 +1058,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 BookmarkBridge::FileSelected(const ui::SelectedFileInfo& file, int index) {
-+                            void* params) {
 +  base::FilePath path = file.path();
 +  base::ThreadPool::PostTaskAndReplyWithResult(
 +      FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock()},
@@ -1101,12 +1071,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;
++  base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-+  if (path.IsContentUri()) {
-+    file = base::OpenContentUriForRead(path);
-+  } else {
-+    file.Initialize(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-+  }
 +  if (!file.IsValid()) {
 +    select_file_dialog_->ShowToast("Cannot open bookmarks file for import");
 +    return "";
@@ -1183,8 +1148,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,15 +1156,15 @@ 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/partnerbookmarks/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"
-@@ -39,6 +40,9 @@
+@@ -37,6 +38,9 @@
  #include "components/signin/public/identity_manager/identity_manager.h"
  #include "url/android/gurl_android.h"
  
@@ -1210,7 +1174,7 @@ 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
-@@ -52,7 +56,8 @@ class BookmarkBridge : public ProfileObserver,
+@@ -50,7 +54,8 @@ class BookmarkBridge : public ProfileObserver,
                         public ReadingListManager::Observer,
                         public ReadingListModelObserver,
                         public signin::IdentityManager::Observer,
@@ -1220,20 +1184,19 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   public:
    // All of the injected pointers must be non-null and must outlive `this`.
    BookmarkBridge(Profile* profile,
-@@ -95,6 +100,12 @@ class BookmarkBridge : public ProfileObserver,
+@@ -81,6 +86,11 @@ class BookmarkBridge : public ProfileObserver,
  
    bool IsDoingExtensiveChanges(JNIEnv* env);
  
 +  // SelectFileDialog::Listener implementation.
 +  void FileSelected(const ui::SelectedFileInfo& file,
-+                    int index,
++                    int index) override;
-+                    void* params) override;
++  void FileSelectionCanceled() override;
-+  void FileSelectionCanceled(void* params) override;
 +
    jboolean IsEditBookmarksEnabled(JNIEnv* env);
  
    void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env);
-@@ -107,6 +118,15 @@ class BookmarkBridge : public ProfileObserver,
+@@ -93,6 +103,15 @@ class BookmarkBridge : public ProfileObserver,
                                                               jlong id,
                                                               jint type);
  
@@ -1249,7 +1212,7 @@ 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,
-@@ -375,6 +395,9 @@ class BookmarkBridge : public ProfileObserver,
+@@ -363,6 +382,9 @@ class BookmarkBridge : public ProfileObserver,
    void CreateOrDestroyAccountReadingListManagerIfNeeded();
  
    const raw_ptr<Profile> profile_;  // weak
@@ -1259,7 +1222,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
    const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
    const raw_ptr<bookmarks::ManagedBookmarkService>
-@@ -391,6 +414,7 @@ class BookmarkBridge : public ProfileObserver,
+@@ -377,6 +399,7 @@ class BookmarkBridge : public ProfileObserver,
    std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
        grouped_bookmark_actions_;
    PrefChangeRegistrar pref_change_registrar_;
@@ -1267,7 +1230,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.
-@@ -422,6 +446,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -408,6 +431,10 @@ class BookmarkBridge : public ProfileObserver,
  
    bool suppress_observer_notifications_ = false;
  
@@ -1281,7 +1244,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
 +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
-@@ -27,6 +27,9 @@
+@@ -33,6 +33,9 @@
  #include "base/task/thread_pool.h"
  #include "base/time/time.h"
  #include "base/values.h"
@@ -1291,22 +1254,6 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
  #include "chrome/browser/bookmarks/bookmark_model_factory.h"
  #include "chrome/browser/favicon/favicon_service_factory.h"
  #include "chrome/browser/profiles/profile.h"
-@@ -234,7 +237,15 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
-   // Opens the file, returning true on success.
-   bool OpenFile() {
-     int flags = base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE;
-+#if BUILDFLAG(IS_ANDROID)
-+    if (path_.IsContentUri()) {
-+      file_ = std::make_unique<base::File>(base::OpenContentUriForWrite(path_));
-+    } else {
-+      file_ = std::make_unique<base::File>(path_, flags);
-+    }
-+#else
-     file_ = std::make_unique<base::File>(path_, flags);
-+#endif
-     if (!file_->IsValid()) {
-       PLOG(ERROR) << "Could not create " << path_;
-       return false;
 diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
@@ -1384,29 +1331,29 @@ 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
-@@ -180,6 +180,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -216,6 +216,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kCacheActivityTaskID,
+     &kCCTAuthTab,
-     &kCastDeviceFilter,
+     &kCCTAuthTabDisableAllExternalIntents,
-     &kClearOmniboxFocusAfterNavigation,
+     &kCCTAuthTabEnableHttpsRedirects,
 +    &kBookmarksExportUseSaf,
-     &kCreateNewTabInitializeRenderer,
+     &kCCTBeforeUnload,
      &kCCTClientDataHeader,
-     &kCCTEmbedderSpecialBehaviorTrigger,
+     &kCCTEarlyNav,
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -504,6 +504,7 @@ public abstract class ChromeFeatureList {
+@@ -579,6 +579,7 @@ public abstract class ChromeFeatureList {
+     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
-     public static final String VERTICAL_AUTOMOTIVE_BACK_BUTTON_TOOLBAR =
+     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
-             "VerticalAutomotiveBackButtonToolbar";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
      public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
-     public static final String WEB_APK_ALLOW_ICON_UPDATE = "WebApkAllowIconUpdate";
      public static final String WEB_APK_BACKUP_AND_RESTORE_BACKEND = "WebApkBackupAndRestoreBackend";
+     public static final String WEB_APK_INSTALL_FAILURE_NOTIFICATION =
 diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
 --- a/chrome/browser/importer/profile_writer.cc
 +++ b/chrome/browser/importer/profile_writer.cc
-@@ -125,6 +125,16 @@ void ProfileWriter::AddBookmarks(
+@@ -124,6 +124,16 @@ void ProfileWriter::AddBookmarks(
      return;
  
    BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -1449,17 +1396,17 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -104,6 +104,8 @@ public final class ChromePreferenceKeys {
+@@ -115,6 +115,8 @@ public final class ChromePreferenceKeys {
              "enhanced_bookmark_last_used_parent_folder";
      public static final String BOOKMARKS_SORT_ORDER = "Chrome.Bookmarks.BookmarkRowSortOrder";
      public static final String BOOKMARKS_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay";
 +    public static final String BOOKMARKS_LAST_EXPORT_URI =
 +            "Chrome.Bookmarks.Last_Export_Uri";
  
-     /**
+     /** Whether Chrome is set as the default browser. Default value is false. */
-      * Whether Chrome is set as the default browser.
+     public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
-@@ -900,6 +902,7 @@ public final class ChromePreferenceKeys {
+@@ -935,6 +937,7 @@ public final class ChromePreferenceKeys {
-                 AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
+                 AUXILIARY_SEARCH_IS_SCHEMA_SET,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
 +                BOOKMARKS_LAST_EXPORT_URI,
@@ -1469,7 +1416,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
-@@ -253,6 +253,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>
@@ -1497,7 +1444,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
-@@ -400,6 +400,9 @@ static_library("common_lib") {
+@@ -360,6 +360,9 @@ static_library("common_lib") {
      sources += [
        "media/chrome_media_drm_bridge_client.cc",
        "media/chrome_media_drm_bridge_client.h",
@@ -1510,7 +1457,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
-@@ -85,8 +85,6 @@ static_library("utility") {
+@@ -89,8 +89,6 @@ static_library("utility") {
  
    if (!is_android) {
      sources += [
@@ -1519,7 +1466,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",
-@@ -224,6 +222,11 @@ static_library("utility") {
+@@ -227,6 +225,11 @@ static_library("utility") {
      ]
    }
  
@@ -1552,7 +1499,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
  // Given the URL of a page and a favicon data URL, adds an appropriate record
  // to the given favicon usage vector.
  void DataURLToFaviconUsage(const GURL& link_url,
-@@ -85,6 +88,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
+@@ -88,6 +91,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
  
    favicons->push_back(usage);
  }
@@ -1560,7 +1507,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
  
  }  // namespace
  
-@@ -105,14 +109,29 @@ static std::string stripDt(const std::string& lineDt) {
+@@ -108,14 +112,29 @@ static std::string stripDt(const std::string& lineDt) {
  }
  
  void ImportBookmarksFile(
@@ -1593,7 +1540,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
    std::vector<std::string> lines = base::SplitString(
        content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
  
-@@ -125,6 +144,7 @@ void ImportBookmarksFile(
+@@ -128,6 +147,7 @@ void ImportBookmarksFile(
    std::vector<std::u16string> path;
    size_t toolbar_folder_index = 0;
    std::string charset = "UTF-8";  // If no charset is specified, assume utf-8.
@@ -1601,7 +1548,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
    for (size_t i = 0;
         i < lines.size() &&
             (cancellation_callback.is_null() || !cancellation_callback.Run());
-@@ -217,10 +237,12 @@ void ImportBookmarksFile(
+@@ -219,10 +239,12 @@ void ImportBookmarksFile(
        }
        bookmarks->push_back(entry);
  
@@ -1635,7 +1582,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; }
  
@@ -1681,24 +1628,24 @@ new file mode 100644
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
-@@ -45,6 +45,7 @@ import org.chromium.base.task.AsyncTask;
+@@ -49,6 +49,7 @@ import org.chromium.build.annotations.NullMarked;
- import org.chromium.base.task.PostTask;
+ import org.chromium.build.annotations.NullUnmarked;
- import org.chromium.base.task.TaskTraits;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.ui.R;
 +import org.chromium.ui.widget.Toast;
  import org.chromium.ui.UiUtils;
  
  import java.io.File;
-@@ -67,6 +68,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -72,6 +73,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
      private static final String TAG = "SelectFileDialog";
      private static final String IMAGE_TYPE = "image";
      private static final String VIDEO_TYPE = "video";
 +    private static final String HTML_TYPE = "html";
      private static final String AUDIO_TYPE = "audio";
      private static final String ALL_TYPES = "*/*";
- 
+     private static final String GENERIC_TYPE = "application/octet-stream";
-@@ -306,6 +308,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -324,6 +326,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
-         ResettersForTesting.register(() -> mFileTypes = oldValue);
+         mMimeTypes = convertToSupportedMimeTypes(mFileTypes);
      }
  
 +    @CalledByNative
@@ -1708,8 +1655,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
+@@ -399,7 +406,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          List<String> missingPermissions = new ArrayList<>();
          String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
          boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1718,7 +1665,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
+@@ -452,7 +459,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
  
                                  // TODO(finnur): Remove once we figure out the cause of
                                  // crbug.com/950024.
@@ -1727,7 +1674,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
+@@ -469,7 +476,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                                      }
                                  }
  
@@ -1736,16 +1683,16 @@ 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
+@@ -775,6 +782,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+                 mimeTypes.add(mimeType);
              }
-             if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
          }
 +        if (mimeTypes.size() == 0) return null;
          return mimeTypes;
      }
  
-@@ -1034,6 +1042,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1149,6 +1157,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
-         return countAcceptTypesFor(superType) == mFileTypes.size();
+         return countAcceptTypesFor(superType) == mMimeTypes.size();
      }
  
 +    private boolean shouldShowHtmlTypes() {
@@ -1753,8 +1700,8 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
 +    }
 +
      /**
-      * Checks whether the list of accepted types effectively describes only a single
+      * Checks whether the list of accepted types effectively describes only a single type, which
-      * type, which might be wildcard. For example:
+      * might be wildcard. For example:
 diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/strings/android_ui_strings.grd
 --- a/ui/android/java/strings/android_ui_strings.grd
 +++ b/ui/android/java/strings/android_ui_strings.grd
@@ -1771,7 +1718,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();
  
@@ -1783,8 +1730,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(
+@@ -175,6 +175,12 @@ void SelectFileDialogImpl::SelectFileImpl(
-                                    owning_window->GetJavaObject());
+       owning_window->GetJavaObject());
  }
  
 +void SelectFileDialogImpl::ShowToast(const std::string& message) {
@@ -1799,8 +1746,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 {
+@@ -53,6 +53,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
-                       void* params,
+                       gfx::NativeWindow owning_window,
                        const GURL* caller) override;
  
 +  void ShowToast(const std::string& message) override;
@@ -1837,7 +1784,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;
@@ -1845,7 +1792,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

@@ -4,6 +4,7 @@ Subject: Add custom tab intents privacy option
 
 Add custom tab intents privacy option and force
 open external links in incognito flag.
+Use the CCT ephemeral mode.
 
 Flags are mutually exclusive.
 
@@ -11,31 +12,40 @@ See also: https://github.com/bromite/bromite/issues/1474
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../java/res/xml/privacy_preferences.xml      | 10 ++++++++
+ .../java/res/xml/privacy_preferences.xml      | 15 ++++++
- .../browser/LaunchIntentDispatcher.java       | 21 ++++++++++++++++
+ .../browser/LaunchIntentDispatcher.java       | 21 ++++++++
+ .../CustomTabIntentDataProvider.java          |  4 +-
  .../customtabs/CustomTabsConnection.java      |  1 +
- .../IncognitoCustomTabIntentDataProvider.java |  6 +++++
+ .../IncognitoCustomTabIntentDataProvider.java | 14 ++++++
- .../privacy/settings/PrivacySettings.java     | 24 +++++++++++++++++++
+ .../privacy/settings/PrivacySettings.java     | 50 +++++++++++++++++++
- .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++++-
+ .../browser/flags/ChromeFeatureList.java      |  2 +
- .../strings/android_chrome_strings.grd        | 14 +++++++++++
+ .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++-
+ ...Add-custom-tab-intents-privacy-option.grdp | 25 ++++++++++
+ .../OriginVerifier.java                       |  5 ++
  .../core/common/language_experiments.cc       |  1 +
  .../add-custom-tab-intents-privacy-option.inc |  1 +
- 9 files changed, 83 insertions(+), 1 deletion(-)
+ 12 files changed, 143 insertions(+), 2 deletions(-)
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -54,6 +54,16 @@ found in the LICENSE file.
+@@ -62,6 +62,21 @@ found in the LICENSE file.
-         android:key="do_not_track"
+         android:key="cromite_flags"
-         android:title="@string/do_not_track_title"
+         android:title="@string/cromite_flags_title"
-         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
+         app:url="@string/cromite_flags_url" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="allow_custom_tab_intents"
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:title="@string/uses_separate_storagepartition_for_cct_title"
++        android:summary="@string/uses_separate_storagepartition_for_cct_summary"
++        app:featureName="maylaunchurl-uses-separate-storage-partition"
++        app:needRestart="true" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="open_external_links_incognito"
 +        android:title="@string/open_external_links_incognito_title"
 +        android:summary="@string/open_external_links_incognito_summary"
@@ -46,7 +56,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -52,6 +52,9 @@ import java.lang.annotation.Retention;
+@@ -64,6 +64,9 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -56,8 +66,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  /**
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
-@@ -239,6 +242,9 @@ public class LaunchIntentDispatcher {
+@@ -267,6 +270,9 @@ public class LaunchIntentDispatcher {
-      */
+     @OptIn(markerClass = ExperimentalAuthTab.class)
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
 +        if (!ContextUtils.getAppSharedPreferences()
@@ -66,9 +76,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          Log.w(
                  TAG,
                  "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -260,6 +266,10 @@ public class LaunchIntentDispatcher {
+@@ -295,6 +301,10 @@ public class LaunchIntentDispatcher {
-         newIntent.setData(uri);
+         // Make sure the result of the CustomTabActivity is forwarded to the client.
-         newIntent.setClassName(context, CustomTabActivity.class.getName());
+         newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
  
 +        if (ContextUtils.getAppSharedPreferences()
 +                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
@@ -77,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          // Since configureIntentForResizableCustomTab() might change the componenet/class
          // associated with the passed intent, it needs to be called after #setClassName(context,
          // CustomTabActivity.class.getName());
-@@ -407,6 +417,17 @@ public class LaunchIntentDispatcher {
+@@ -490,6 +500,17 @@ public class LaunchIntentDispatcher {
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -95,10 +105,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
              if (!chromeTabbedTaskExists()) {
                  newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true);
              }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+@@ -1187,7 +1187,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+     public @CustomTabProfileType int getCustomTabMode() {
+         return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
+                 ? CustomTabProfileType.INCOGNITO
+-                : CustomTabProfileType.REGULAR;
++                : (ChromeFeatureList.sMayLaunchurlUsesSeparateStoragePartition.isEnabled()
++                    ? CustomTabProfileType.EPHEMERAL
++                    : CustomTabProfileType.REGULAR);
+     }
+ 
+     @Override
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -854,6 +854,7 @@ public class CustomTabsConnection {
+@@ -980,6 +980,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -109,7 +133,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
-@@ -38,6 +38,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -40,6 +40,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -119,7 +143,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
+@@ -118,6 +121,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
      }
  
      private static boolean isIntentFromThirdPartyAllowed() {
@@ -129,20 +153,58 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
          return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
      }
  
+@@ -217,6 +223,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+     }
+ 
+     public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
++        if (ContextUtils.getAppSharedPreferences()
++                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
++            return true;
++        }
+         if (!isIncognitoRequested(intent)) return false;
+         var session = SessionHolder.getSessionHolderFromIntent(intent);
+         if (isIntentFromThirdPartyAllowed()
+@@ -330,6 +340,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+ 
+     @Override
+     public @CustomTabProfileType int getCustomTabMode() {
++        if (ContextUtils.getAppSharedPreferences()
++                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
++            return CustomTabProfileType.EPHEMERAL;
++        }
+         return CustomTabProfileType.INCOGNITO;
+     }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -103,6 +103,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -60,6 +60,15 @@ import org.chromium.device.DeviceFeatureList;
+ import org.chromium.device.DeviceFeatureMap;
+ import org.chromium.ui.text.SpanApplier;
  
++import android.app.role.RoleManager;
++import android.content.Context;
++import android.content.Intent;
++import android.content.pm.ResolveInfo;
++import android.provider.Settings;
++import android.text.TextUtils;
++import org.chromium.base.IntentUtils;
++import org.chromium.base.PackageManagerUtils;
++
+ import androidx.annotation.Nullable;
+ import androidx.preference.PreferenceCategory;
+ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+@@ -112,6 +121,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private IncognitoLockSettings mIncognitoLockSettings;
+     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
  
 +    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);
+         mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -298,6 +301,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -349,6 +361,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
      }
  
@@ -152,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
-@@ -314,6 +320,14 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -369,6 +384,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
          } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -160,6 +222,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
++            // check default browser
++            if ((boolean)newValue) {
++                ResolveInfo info = PackageManagerUtils.resolveDefaultWebBrowserActivity();
++                if (info == null || info.match == 0 ||
++                    !TextUtils.equals(ContextUtils.getApplicationContext().getPackageName(),
++                                      info.activityInfo.packageName)) {
++                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
++                                RoleManager roleManager = (RoleManager) getContext().getSystemService(Context.ROLE_SERVICE);
++                                Intent intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_BROWSER);
++                                startActivityForResult(intent, 0);
++                        } else {
++                                Intent intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
++                                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
++                                IntentUtils.safeStartActivity(getContext(), intent);
++                        }
++                }
++            }
 +        } else if (PREF_OPEN_EXTERNAL_LINKS_INCOGNITO.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
@@ -167,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -336,6 +350,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -401,6 +441,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                      UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
@@ -184,6 +263,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
          if (doNotTrackPref != null) {
              doNotTrackPref.setSummary(
+diff --git a/chrome/browser/flags/android/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
+@@ -719,6 +719,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sLogoPolishAnimationKillSwitch =
+             newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true);
+     public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);
++    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
+     public static final CachedFlag sMostVisitedTilesReselect =
+             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
+     public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
+@@ -883,6 +884,7 @@ public abstract class ChromeFeatureList {
+                     sLogoPolishAnimationKillSwitch,
+                     sNotificationTrampoline,
+                     sMagicStackAndroid,
++                    sMayLaunchurlUsesSeparateStoragePartition,
+                     sMostVisitedTilesReselect,
+                     sMultiInstanceApplicationStatusCleanup,
+                     sNavBarColorAnimation,
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
@@ -200,34 +298,55 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
          String packageName = ContextUtils.getApplicationContext().getPackageName();
          return tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP
                  && !TextUtils.equals(app.getAppId(), packageName);
-diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
---- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+new file mode 100644
-+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- /dev/null
-@@ -5217,6 +5217,20 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
-       <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.">
+@@ -0,0 +1,25 @@
-          Resume
++<?xml version="1.0" encoding="utf-8"?>
-       </message>
++<grit-part>
-+      <!-- Allow custom tab intents -->
++    <!-- Allow custom tab intents -->
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
++    <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow custom tab intents
++        Allow custom tab intents.
-+      </message>
++    </message>
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
++    <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow applications to open custom tab intents, similar to webview.
++        Allow applications to open custom tab intents, similar to webview. To work, Cromite must be set as the default browser.
-+      </message>
++    </message>
-+      <!-- Open External Links in Incognito -->
++
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
++    <message name="IDS_USES_SEPARATE_STORAGEPARTITION_FOR_CCT_TITLE" desc="Text for 'Use ephemeral mode for CCT' settings-privacy option.">
++        Use ephemeral mode for CCT
++    </message>
++    <message name="IDS_USES_SEPARATE_STORAGEPARTITION_FOR_CCT_SUMMARY" desc="Summary text for 'Use ephemeral mode for CCT' settings-privacy option.">
++        Use a separate storage partition when opening custom tab intents
++    </message>
++
++    <!-- Open External Links in Incognito -->
++    <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
 +        Open external links in incognito
-+      </message>
++    </message>
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
++    <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
-+        Force the opening of all external links in incognito mode
++        Force the opening of all external links in incognito mode and uses the CCT ephemeral mode. Caution: there is only one incognito profile.
-+      </message>
++    </message>
-       <!-- Usage Stats strings -->
++</grit-part>
-       <message name="IDS_USAGE_STATS_CONSENT_TITLE" desc="Title for activity authorizing Digital Wellbeing to access Chrome usage data">
+diff --git a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
-         Show your Chrome activity in Digital Wellbeing?
+--- a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
++++ b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
+@@ -176,6 +176,11 @@ public abstract class OriginVerifier {
+         assert mNativeOriginVerifier != 0
+                 : "Either provide a browserContextHandle to "
+                         + "OriginVerifier#ctor or call initNativeOriginVerifier.";
++        if ((true)) {
++            PostTask.runOrPostTask(
++                    TaskTraits.UI_DEFAULT, new VerifiedCallback(origin, false, null));
++            return;
++        }
+ 
+         String scheme = origin.uri().getScheme();
+         String host = origin.uri().getHost();
 diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc
 --- a/components/language/core/common/language_experiments.cc
 +++ b/components/language/core/common/language_experiments.cc
-@@ -24,4 +24,5 @@ BASE_FEATURE(kCctAutoTranslate,
+@@ -32,4 +32,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
  // Params:
  const char kContentLanguagesDisableObserversParam[] = "disable_observers";
  

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

@@ -7,16 +7,16 @@ Corrected Exit functionality
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/menu/main_menu.xml                  | 6 ++++++
- .../org/chromium/chrome/browser/ApplicationLifetime.java    | 2 ++
  .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
  .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
+ .../chrome/browser/init/ChromeLifetimeController.java       | 2 ++
  .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
  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
-@@ -160,6 +160,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" />
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only in the tab switcher -->
-@@ -186,6 +189,9 @@ found in the LICENSE file.
+@@ -192,6 +195,9 @@ found in the LICENSE file.
          <item android:id="@id/preferences_id"
              android:title="@string/menu_settings"
              android:icon="@drawable/settings_cog" />
@@ -36,58 +36,39 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only when the tablet has no visible tabs -->
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser;
- import org.jni_zero.CalledByNative;
- 
- import org.chromium.base.ObserverList;
-+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
- 
- /** Watches for when Chrome is told to restart itself. */
- public class ApplicationLifetime {
-@@ -39,6 +40,7 @@ public class ApplicationLifetime {
- 
-     @CalledByNative
-     public static void terminate(boolean restart) {
-+        IncognitoNotificationManager.dismissIncognitoNotification();
-         for (Observer observer : sObservers) {
-             observer.onTerminate(restart);
-         }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -267,6 +267,8 @@ import java.util.Set;
+@@ -292,6 +292,8 @@ import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.function.DoubleConsumer;
  
-+import org.chromium.chrome.browser.ApplicationLifetime;
++import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +
  /**
   * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
   * accessible via a chrome specific tab switching UI.
-@@ -2935,6 +2937,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3000,6 +3002,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
-         } else if (id == R.id.close_tab) {
+                     .closeTabs(
-             getCurrentTabModel().closeTab(currentTab, true, false, true);
+                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
              RecordUserAction.record("MobileTabClosed");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
          } else if (id == R.id.close_all_tabs_menu_id) {
              // Close both incognito and normal tabs.
-             CloseAllTabsDialog.show(
+             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
-@@ -62,6 +62,7 @@ import org.chromium.chrome.R;
+@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
  import org.chromium.chrome.browser.AppHooks;
-+import org.chromium.chrome.browser.ApplicationLifetime;
++import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2571,6 +2572,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2374,6 +2375,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return true;
          }
  
@@ -99,10 +80,29 @@ 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
+@@ -18,6 +18,7 @@ import org.chromium.base.ContextUtils;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.chrome.browser.BrowserRestartActivity;
+ import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
++import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+ 
+ /**
+  * Answers requests to kill and (potentially) restart Chrome's main browser process.
+@@ -73,6 +74,7 @@ class ChromeLifetimeController
+ 
+     @Override
+     public void onTerminate(boolean restart) {
++        IncognitoNotificationManager.dismissIncognitoNotification();
+         mRestartChromeOnDestroy = restart;
+ 
+         // Tell all Chrome Activities to finish themselves.
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3846,6 +3846,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -4388,6 +4388,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"
-@@ -417,6 +418,15 @@ AutocompleteController::AutocompleteController(
+@@ -535,6 +536,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,
+@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
    if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
      matches_.push_back(what_you_typed_match);
  
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
  #include "base/functional/callback.h"
  #include "base/i18n/break_iterator.h"
  #include "base/i18n/case_conversion.h"
-@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -628,6 +629,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 @@
+@@ -14,6 +14,8 @@
- #include <stddef.h>
+ #include <string_view>
  
  #include "base/check_op.h"
 +#include "base/containers/contains.h"
@@ -88,15 +88,15 @@ 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,
+@@ -655,6 +657,8 @@ GURL FixupURLInternal(const std::string& text,
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
-     if (chrome_url && !parts.host.is_valid())
+     if (chrome_url && !parts.host.is_valid()) {
 +     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
 +         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
        url.append(kChromeUIDefaultHost);
+     }
      FixupPort(trimmed, parts.port, &url);
-     FixupPath(trimmed, parts.path, &url);
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc
 new file mode 100644
 --- /dev/null

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(
+@@ -165,6 +169,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,18 +45,18 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1045,6 +1045,7 @@ component("net") {
+@@ -1112,6 +1112,7 @@ component("net") {
      "//build:chromeos_buildflags",
      "//components/miracle_parameter/common",
+     "//components/network_time/time_tracker",
++    "//components/network_session_configurator/common",
      "//net/http:transport_security_state_generated_files",
-+    "//components/network_session_configurator/common"
+     "//third_party/simdutf:simdutf",
    ]
- 
-   public_deps = [
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -113,6 +113,7 @@
+@@ -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"
-@@ -1388,6 +1389,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -3,14 +3,231 @@ Date: Tue, 25 May 2021 19:46:14 +0200
 Subject: Add flag to disable external intent requests
 
 Adds a new flag that allows to control the switch with same name;
-when flag is disabled no external intent will ever be allowed, for any URL.
+when flag is disabled no external intent will ever be allowed,
+for any URL except for the tel: schema.
+This also reverts commit b710cefb53b558a8bcd884f6baf0229ba4225721 and
+enables IntentBlockExternalFormRedirectsNoGesture.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- ...Add-flag-to-disable-external-intent-requests.inc | 13 +++++++++++++
+ .../java/res/xml/privacy_preferences.xml      |  7 +++-
- 1 file changed, 13 insertions(+)
+ .../customtabs/CustomTabDelegateFactory.java  |  2 ++
+ .../ExternalNavigationDelegateImpl.java       |  4 ++-
+ .../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++
+ ...g-to-disable-external-intent-requests.grdp |  9 +++++
+ .../android/external_intents_features.cc      |  7 +++-
+ .../android/external_intents_features.h       |  1 +
+ .../ExternalIntentsFeatures.java              |  6 ++++
+ .../ExternalNavigationHandler.java            | 21 ++++++++++++
+ ...ag-to-disable-external-intent-requests.inc | 13 ++++++++
+ ...t-Delete-block-external-form-redirects.inc | 15 +++++++++
+ ...ag-to-disable-external-intent-requests.inc |  3 ++
+ 12 files changed, 118 insertions(+), 3 deletions(-)
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc
 
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -87,7 +87,12 @@ found in the LICENSE file.
+         android:title="@string/settings_incognito_tab_lock_title"
+         android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
+         android:persistent="false" />
+-
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="allow_external_intent_requests"
++        android:title="@string/allow_external_intent_requests_title"
++        android:summary="@string/allow_external_intent_requests_summary"
++        app:featureName="AllowExternalIntentRequests"
++        app:needRestart="false" />
+     <PreferenceCategory
+         android:key="security_section"
+         android:title="@string/security_section_title" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
+@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
+ import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
+ import org.chromium.chrome.browser.flags.ActivityType;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
++import org.chromium.chrome.browser.flags.cromite.sAllowExternalIntentRequests;
+ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
+ import org.chromium.chrome.browser.fullscreen.FullscreenManager;
+ import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
+@@ -133,6 +134,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+ 
+         @Override
+         public boolean shouldDisableAllExternalIntents() {
++            if (!sAllowExternalIntentRequests.getInstance().isEnabled()) return true;
+             return mActivityType == ActivityType.AUTH_TAB
+                     && ChromeFeatureList.sCctAuthTabDisableAllExternalIntents.isEnabled();
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+@@ -20,6 +20,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.password_manager.CctPasswordSavingMetricsRecorderBridge;
+ import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
+@@ -107,7 +108,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+ 
+     @Override
+     public boolean shouldDisableExternalIntentRequestsForUrl(GURL url) {
+-        return false;
++        if ("tel".equals(url.getScheme())) return false;
++        return !sAllowExternalIntentRequests.getInstance().isEnabled();
+     }
+ 
+     @Override
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
+@@ -0,0 +1,33 @@
++/*
++    This file is part of Cromite.
++
++    Cromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Cromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++package org.chromium.chrome.browser.flags.cromite;
++
++import org.chromium.components.cached_flags.CachedFlag;
++import org.chromium.chrome.browser.flags.ChromeFeatureMap;
++
++public class sAllowExternalIntentRequests {
++    private static final CachedFlag sInstance =
++        new CachedFlag(ChromeFeatureMap.getInstance(),
++            "AllowExternalIntentRequests", false);
++
++    private sAllowExternalIntentRequests() {}
++
++    public static CachedFlag getInstance() {
++        return sInstance;
++    }
++}
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="utf-8"?>
++<grit-part>
++    <message name="IDS_ALLOW_EXTERNAL_INTENT_REQUESTS_TITLE" desc="">
++        Allow forward URL requests to external intents
++    </message>
++    <message name="IDS_ALLOW_EXTERNAL_INTENT_REQUESTS_SUMMARY" desc="">
++        If disabled, URL requests will never allow redirection to an external intent, such as open application. Caution: since no verification is possible on the information, allows linkage between browser browsing and activity on the application.
++    </message>
++</grit-part>
+diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
+--- a/components/external_intents/android/external_intents_features.cc
++++ b/components/external_intents/android/external_intents_features.cc
+@@ -27,7 +27,6 @@ namespace {
+ const base::Feature* kFeaturesExposedToJava[] = {
+     &kExternalNavigationDebugLogs, &kBlockFrameRenavigations,
+     &kBlockIntentsToSelf, &kTrustedClientGestureBypass};
+-
+ }  // namespace
+ 
+ // Alphabetical:
+@@ -48,7 +47,13 @@ BASE_FEATURE(kTrustedClientGestureBypass,
+              "TrustedClientGestureBypass",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
++CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
++                "IntentBlockExternalFormRedirectsNoGesture",
++                base::FEATURE_ENABLED_BY_DEFAULT);
++
+ static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
++  if (ordinal == -1)
++    return reinterpret_cast<jlong>(&kIntentBlockExternalFormRedirectsNoGesture);
+   return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
+ }
+ 
+diff --git a/components/external_intents/android/external_intents_features.h b/components/external_intents/android/external_intents_features.h
+--- a/components/external_intents/android/external_intents_features.h
++++ b/components/external_intents/android/external_intents_features.h
+@@ -9,6 +9,7 @@
+ 
+ namespace external_intents {
+ 
++BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture);
+ BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs);
+ BASE_DECLARE_FEATURE(kBlockFrameRenavigations);
+ BASE_DECLARE_FEATURE(kBlockIntentsToSelf);
+diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
++++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
+@@ -18,6 +18,12 @@ import org.chromium.base.Features;
+  */
+ @JNINamespace("external_intents")
+ public class ExternalIntentsFeatures extends Features {
++    public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME =
++            "IntentBlockExternalFormRedirectsNoGesture";
++
++    public static final ExternalIntentsFeatures INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE =
++            new ExternalIntentsFeatures(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
++
+     public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
+     public static final String BLOCK_FRAME_RENAVIGATIONS_NAME = "BlockFrameRenavigations3";
+     public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf";
+diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
++++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+@@ -1530,6 +1530,12 @@ public class ExternalNavigationHandler {
+                 || ignoreBackForwardNav(params);
+     }
+ 
++    /** Wrapper of check against the feature to support overriding for testing. */
++    @VisibleForTesting
++    boolean blockExternalFormRedirectsWithoutGesture() {
++        return ExternalIntentsFeatures.INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE.isEnabled();
++    }
++
+     private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
+             ExternalNavigationParams params,
+             Intent targetIntent,
+@@ -1586,6 +1592,21 @@ public class ExternalNavigationHandler {
+             return OverrideUrlLoadingResult.forNoOverride();
+         }
+ 
++        // http://crbug.com/839751: Require user gestures for form submits to external
++        //                          protocols.
++        // TODO(tedchoc): Turn this on by default once we verify this change does
++        //                not break the world.
++        int pageTransitionCore = params.getPageTransition() & PageTransition.CORE_MASK;
++        boolean isFormSubmit = pageTransitionCore == PageTransition.FORM_SUBMIT;
++        boolean isRedirectFromFormSubmit = isFormSubmit && params.isRedirect();
++        if (isRedirectFromFormSubmit && !incomingIntentRedirect && !params.hasUserGesture()
++                && blockExternalFormRedirectsWithoutGesture()) {
++            if (debug()) {
++                Log.i(TAG, "Incoming form intent attempting to redirect without user gesture");
++            }
++            return OverrideUrlLoadingResult.forNoOverride();
++        }
++
+         if (hasInternalScheme(params.getUrl(), targetIntent)
+                 || hasContentScheme(params.getUrl(), targetIntent)
+                 || hasFileSchemeInIntentURI(params.getUrl(), targetIntent)
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
 new file mode 100644
 --- /dev/null
@@ -29,4 +246,32 @@ new file mode 100644
 +#endif
 +
 +#endif
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Revert-Delete-block-external-form-redirects.inc
+@@ -0,0 +1,15 @@
++#if BUILDFLAG(IS_ANDROID)
++
++#ifdef FLAG_SECTION
++
++    {"block-external-form-redirects-no-gesture",
++     "Block intents from form submissions without user gesture",
++     "Require a user gesture that triggered a form submission in order to "
++     "allow for redirecting to an external intent.",
++     kOsAndroid,
++     FEATURE_VALUE_TYPE(
++         external_intents::kIntentBlockExternalFormRedirectsNoGesture)},
++
++#endif
++
++#endif
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Add-flag-to-disable-external-intent-requests.inc
+@@ -0,0 +1,3 @@
++CROMITE_FEATURE(kAllowExternalIntentRequests,
++                "AllowExternalIntentRequests",
++                base::FEATURE_DISABLED_BY_DEFAULT);
 --

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

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -104,6 +104,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
    if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
      WebRuntimeFeatures::EnableMediaSession(false);
    }
@@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
  
  // Maximum number of entries in a vibration pattern.
  const unsigned kVibrationPatternLengthMax = 99;
-@@ -109,6 +110,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator,
    // reference to |window| or |navigator| was retained in another window.
    if (!navigator.DomWindow())
      return false;
@@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -660,6 +660,10 @@
+@@ -853,6 +853,10 @@
        status: {"Android": "stable"},
        base_feature: "none",
      },

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

@@ -7,32 +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
-@@ -1926,7 +1926,6 @@ config("default_warnings") {
+@@ -1980,7 +1980,6 @@ config("default_warnings") {
-         # TODO(https://crbug.com/1490607): Fix and re-enable.
+         # TODO(crbug.com/40284799): Fix and re-enable.
          "-Wno-thread-safety-reference-return",
        ]
 -
        cflags_cc += [
          # TODO(crbug.com/328490295): Fix and re-enable for C flags.
          "-Wenum-compare-conditional",
-@@ -1938,6 +1937,15 @@ config("default_warnings") {
+@@ -2001,6 +2000,16 @@ config("default_warnings") {
-           "-Wno-c++11-narrowing-const-reference",
+         # TODO(crbug.com/376641662): Fix and re-enable.
-         ]
+         cflags += [ "-Wno-nontrivial-memcall" ]
        }
 +      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",
 +        ]
 +      }
      }
@@ -41,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
-@@ -58,6 +58,9 @@ declare_args() {
+@@ -54,6 +54,9 @@ declare_args() {
    # to lack of toolchain support.
    gtest_enable_absl_printers = !is_nacl
  
@@ -49,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

@@ -56,13 +56,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../one_time_permissions_tracker.cc           | 33 +++++++-
  .../one_time_permissions_tracker.h            |  5 +-
  .../one_time_permissions_tracker_factory.cc   |  2 +-
+ .../views/permissions/chip/chip_controller.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 ++
  .../android/website_preference_bridge.cc      |  2 +-
  .../strings/android/browser_ui_strings.grd    |  5 ++
- .../core/browser/content_settings_utils.cc    | 36 ++++++++
+ .../core/browser/content_settings_utils.cc    | 42 ++++++++--
  .../core/browser/content_settings_utils.h     |  6 ++
  .../core/common/content_settings_enums.mojom  |  9 ++
  .../page_info/PageInfoController.java         |  4 +-
@@ -86,7 +88,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(-)
+ 36 files changed, 490 insertions(+), 69 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
@@ -174,7 +176,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
  OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
  
  OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
-@@ -258,6 +284,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
+@@ -257,6 +283,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
    for (auto& observer : observer_list_) {
      observer.OnLastPageFromOriginClosed(origin);
    }
@@ -206,7 +208,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,25 +220,49 @@ 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 {
 -  return std::make_unique<OneTimePermissionsTracker>();
 +  return std::make_unique<OneTimePermissionsTracker>(context);
  }
+diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
+--- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc
++++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
+@@ -234,7 +234,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
+       active_chip_permission_request_manager_.value()->Accept();
+       break;
+     case permissions::PermissionAction::GRANTED_ONCE:
+-      active_chip_permission_request_manager_.value()->AcceptThisTime();
++      active_chip_permission_request_manager_.value()->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
+       break;
+     case permissions::PermissionAction::DENIED:
+       active_chip_permission_request_manager_.value()->Deny();
 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
-@@ -336,7 +336,7 @@ void EmbeddedPermissionPrompt::Allow() {
+@@ -664,7 +664,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) {
- 
+       delegate_->Accept();
- void EmbeddedPermissionPrompt::AllowThisTime() {
+       break;
-   PrecalculateVariantsForMetrics();
+     case Action::kAllowThisTime:
--  delegate_->AcceptThisTime();
+-      delegate_->AcceptThisTime();
-+  delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
++      delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
-   CloseCurrentViewAndMaybeShowNext(/*first_prompt=*/false);
+       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
+@@ -100,7 +100,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
@@ -263,7 +289,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -557,6 +557,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -591,6 +591,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
          }
      }
  
@@ -275,9 +301,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();
-@@ -1083,6 +1088,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1156,6 +1161,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-         if (contentType == mHighlightedPermission) {
+                     AppCompatResources.getColorStateList(getContext(), mHighlightColor)
-             switchPreference.setBackgroundColor(mHighlightColor);
+                             .getDefaultColor());
          }
 +        if (isSessionPermission(contentType)) {
 +            switchPreference.setSummary(switchPreference.getSummary() + " " +
@@ -289,7 +315,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,
+@@ -200,7 +200,7 @@ void GetOrigins(JNIEnv* env,
        seen_origins.push_back(origin);
        insertionFunc(env, static_cast<int>(content_type), list,
                      ConvertOriginToJavaString(env, origin), jembedder,
@@ -301,7 +327,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -661,6 +661,11 @@
+@@ -637,6 +637,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,7 +342,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -155,6 +155,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
+@@ -160,6 +160,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
    return constraints.session_model() == mojom::SessionModel::DURABLE;
  }
  
@@ -359,6 +385,26 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
  bool CanTrackLastVisit(ContentSettingsType type) {
    // Last visit is not tracked for notification permission as it shouldn't be
    // auto-revoked.
+@@ -258,9 +294,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
+       ContentSettingsType::CAPTURED_SURFACE_CONTROL,
+ #endif
+       ContentSettingsType::KEYBOARD_LOCK,
+-      ContentSettingsType::GEOLOCATION,
+-      ContentSettingsType::MEDIASTREAM_MIC,
+-      ContentSettingsType::MEDIASTREAM_CAMERA,
+       ContentSettingsType::HAND_TRACKING,
+       ContentSettingsType::SMART_CARD_DATA,
+   }};
+@@ -274,9 +307,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
+       ContentSettingsType::CAPTURED_SURFACE_CONTROL,
+ #endif
+       ContentSettingsType::KEYBOARD_LOCK,
+-      ContentSettingsType::GEOLOCATION,
+-      ContentSettingsType::MEDIASTREAM_MIC,
+-      ContentSettingsType::MEDIASTREAM_CAMERA,
+       ContentSettingsType::HAND_TRACKING,
+   }};
+   return *types;
 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
@@ -378,11 +424,10 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b
 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
-@@ -57,3 +57,12 @@ enum SessionModel {
+@@ -58,6 +58,15 @@ enum SessionModel {
-   // tab from the origin is closed.
    ONE_TIME,
  };
-+
+ 
 +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
 +// GENERATED_JAVA_CLASS_NAME_OVERRIDE: LifetimeMode
 +enum LifetimeMode {
@@ -391,10 +436,14 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
 +  UNTIL_ORIGIN_CLOSED = 2,
 +  UNTIL_BROWSER_CLOSED = 0,
 +};
++
+ // Identifies the content settings provider of a content setting.
+ // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
+ // GENERATED_JAVA_CLASS_NAME_OVERRIDE: ProviderType
 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
-@@ -393,9 +393,9 @@ public class PageInfoController
+@@ -383,9 +383,9 @@ public class PageInfoController
              String name,
              String nameMidSentence,
              int type,
@@ -432,7 +481,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
              }
          }
  
-@@ -126,13 +131,15 @@ public class PermissionParamsListBuilder {
+@@ -127,13 +132,15 @@ public class PermissionParamsListBuilder {
          public final String nameMidSentence;
          public final int type;
          public final @ContentSettingValues int setting;
@@ -452,7 +501,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
-@@ -151,6 +151,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -165,6 +165,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
@@ -461,7 +510,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)) {
-@@ -159,6 +161,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -173,6 +175,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
        if (setting_to_display) {
          user_specified_settings_to_display[permission.type] =
              *setting_to_display;
@@ -470,7 +519,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
        }
      }
    }
-@@ -175,7 +179,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -189,7 +193,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
@@ -480,7 +529,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
      }
    }
  
-@@ -188,7 +193,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -202,7 +207,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),
@@ -493,7 +542,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1175,6 +1175,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1206,6 +1206,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
@@ -506,7 +555,7 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
 @@ -150,6 +150,7 @@ class PageInfo : private content_settings::CookieControlsObserver,
-         content_settings::SETTING_SOURCE_NONE;
+         content_settings::SettingSource::kNone;
      // Whether the permission is a one-time grant.
      bool is_one_time = false;
 +    bool is_user_session = false;
@@ -590,8 +639,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.setTextAppearance(
-+                    lifetimeOptionsText, R.style.TextAppearance_TextMedium_Primary);
++                    lifetimeOptionsText.getContext(), R.style.TextAppearance_TextMedium_Primary);
 +
 +            LinearLayout.LayoutParams lifetimeOptionsTextLayoutParams =
 +                    new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
@@ -651,7 +700,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
-@@ -150,6 +150,11 @@ void PermissionDialogJavaDelegate::DismissDialog() {
+@@ -158,6 +158,11 @@ void PermissionDialogJavaDelegate::DismissDialog() {
    Java_PermissionDialogDelegate_dismissFromNative(env, j_delegate_);
  }
  
@@ -663,7 +712,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
  // static
  void PermissionDialogDelegate::Create(
      content::WebContents* web_contents,
-@@ -178,6 +183,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting(
+@@ -186,6 +191,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting(
  void PermissionDialogDelegate::Accept(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
    CHECK(permission_prompt_);
@@ -677,7 +726,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
    permission_prompt_->Accept();
  }
  
-@@ -185,12 +197,22 @@ void PermissionDialogDelegate::AcceptThisTime(
+@@ -193,12 +205,22 @@ void PermissionDialogDelegate::AcceptThisTime(
      JNIEnv* env,
      const JavaParamRef<jobject>& obj) {
    CHECK(permission_prompt_);
@@ -715,7 +764,7 @@ 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
-@@ -58,8 +58,12 @@ void PermissionPromptAndroid::Accept() {
+@@ -67,8 +67,12 @@ void PermissionPromptAndroid::Accept() {
    delegate_->Accept();
  }
  
@@ -733,7 +782,7 @@ 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
-@@ -46,8 +46,9 @@ class PermissionPromptAndroid : public PermissionPrompt {
+@@ -49,8 +49,9 @@ class PermissionPromptAndroid : public PermissionPrompt {
  
    void Closing();
    void Accept();
@@ -747,7 +796,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
 diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd
 --- a/components/permissions/android/permissions_android_strings.grd
 +++ b/components/permissions/android/permissions_android_strings.grd
-@@ -264,6 +264,23 @@
+@@ -267,6 +267,23 @@
          Unknown or unsupported device (<ph name="DEVICE_ID">%1$s<ex>A1:B2:C3:D4:E5:F6</ex></ph>)
        </message>
  
@@ -831,7 +880,7 @@ 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,
@@ -840,7 +889,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
      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_),
@@ -850,7 +899,7 @@ 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,
@@ -883,7 +932,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
    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,
@@ -891,7 +940,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
        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,
@@ -904,7 +953,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 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 {
+@@ -251,6 +251,17 @@ bool PermissionContextBase::UsesAutomaticEmbargo() const {
    return true;
  }
  
@@ -922,7 +971,7 @@ 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,
+@@ -497,7 +508,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
                                                const GURL& embedding_origin,
                                                ContentSetting content_setting,
                                                bool is_one_time,
@@ -932,7 +981,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    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,
+@@ -512,13 +524,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) {
@@ -951,7 +1000,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  }
  
-@@ -578,11 +591,27 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -586,11 +599,27 @@ void PermissionContextBase::NotifyPermissionSet(
      ContentSetting content_setting,
      bool is_one_time,
      bool is_final_decision) {
@@ -980,7 +1029,7 @@ 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,
+@@ -630,6 +659,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                   const GURL& embedding_origin,
                                                   ContentSetting content_setting,
                                                   bool is_one_time) {
@@ -996,19 +1045,19 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    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,
+@@ -639,6 +677,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)
+ #if BUILDFLAG(IS_ANDROID)
-   // The Permissions module in Safety check will revoke permissions after
+   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.
@@ -1024,7 +1073,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    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).
@@ -1036,7 +1085,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    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;
  
@@ -1049,7 +1098,7 @@ 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,
@@ -1062,7 +1111,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 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;
@@ -1091,7 +1140,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    DCHECK(delete_callback_.is_null());
  }
-@@ -364,19 +372,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+@@ -404,19 +412,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
    return request_type() == RequestType::kStorageAccess;
  }
  
@@ -1183,7 +1232,7 @@ 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(
+@@ -171,7 +171,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1192,16 +1241,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      request->RequestFinished();
      return;
    }
-@@ -233,7 +233,7 @@ void PermissionRequestManager::AddRequest(
+@@ -246,7 +246,7 @@ void PermissionRequestManager::AddRequest(
-   if (auto_approval_origin) {
+ 
-     if (url::Origin::Create(request->requesting_origin()) ==
+   if (should_auto_approve_request) {
-         auto_approval_origin.value()) {
+     if (should_auto_approve_request == PermissionAction::GRANTED) {
--      request->PermissionGranted(/*is_one_time=*/false);
+-      request->PermissionGranted(/*is_one_time=*/true);
-+      request->PermissionGranted(/*is_one_time=*/false, content_settings::mojom::LifetimeMode::ALWAYS);
++      request->PermissionGranted(/*is_one_time=*/true, content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED);
      }
      request->RequestFinished();
      return;
-@@ -594,7 +594,8 @@ void PermissionRequestManager::Accept() {
+@@ -609,7 +609,8 @@ void PermissionRequestManager::Accept() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED);
      PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1211,7 +1260,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  
  #if !BUILDFLAG(IS_ANDROID)
      std::optional<ContentSettingsType> content_settings_type =
-@@ -612,7 +613,7 @@ void PermissionRequestManager::Accept() {
+@@ -627,7 +628,7 @@ void PermissionRequestManager::Accept() {
    CurrentRequestsDecided(PermissionAction::GRANTED);
  }
  
@@ -1220,7 +1269,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -624,7 +625,8 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -640,7 +641,8 @@ void PermissionRequestManager::AcceptThisTime() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED_ONCE);
      PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1230,7 +1279,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
  
    NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
-@@ -632,6 +634,15 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -648,6 +650,15 @@ void PermissionRequestManager::AcceptThisTime() {
  }
  
  void PermissionRequestManager::Deny() {
@@ -1246,7 +1295,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -655,7 +666,7 @@ void PermissionRequestManager::Deny() {
+@@ -670,7 +681,7 @@ void PermissionRequestManager::Deny() {
      StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
                                  (*requests_iter)->request_type(),
                                  PermissionAction::DENIED);
@@ -1255,7 +1304,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
  
    NotifyRequestDecided(PermissionAction::DENIED);
-@@ -1218,32 +1229,32 @@ PermissionRequestManager::VisitDuplicateRequests(
+@@ -1255,32 +1266,32 @@ PermissionRequestManager::VisitDuplicateRequests(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1298,7 +1347,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
        request);
  }
  
-@@ -1500,7 +1511,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
+@@ -1541,7 +1552,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
    }
    switch (auto_response_for_test_) {
      case ACCEPT_ONCE:
@@ -1310,7 +1359,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 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;
@@ -1322,7 +1371,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    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,

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

@@ -10,8 +10,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bookmarks/android/bookmark_bridge.cc      | 44 +++++++++++-
  .../bookmarks/android/bookmark_bridge.h       |  8 +++
  .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
+ .../bookmark_merged_surface_service.cc        |  3 +
+ .../permanent_folder_ordering_tracker.cc      |  2 +
  .../dialogs/DownloadLocationCustomView.java   |  4 +-
  .../strings/android_chrome_strings.grd        |  3 +
+ .../bookmark_ui_operations_helper.cc          |  2 +
  components/bookmark_bar_strings.grdp          |  6 ++
  .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
  components/bookmarks/browser/bookmark_codec.h |  7 +-
@@ -26,12 +29,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, 241 insertions(+), 15 deletions(-)
+ 25 files changed, 248 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" />
@@ -42,20 +45,20 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/recent_tabs_menu_id"
              android:title="@string/menu_recent_tabs"
              android:icon="@drawable/devices_black_24dp" />
-@@ -180,6 +184,9 @@ found in the LICENSE file.
+@@ -186,6 +190,9 @@ found in the LICENSE file.
-         <item android:id="@+id/close_all_incognito_tabs_menu_id"
+         <item android:id="@id/tinker_tank_menu_id"
-             android:title="@string/menu_close_all_incognito_tabs"
+             android:title="@string/menu_tinker_tank"
-             android:icon="@drawable/btn_close_white" />
+             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
-@@ -91,6 +91,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
+@@ -96,6 +96,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -63,16 +66,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;
-@@ -2960,6 +2961,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3032,6 +3033,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                      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(
+             Runnable closeAllTabsRunnable =
-@@ -3031,6 +3034,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3117,6 +3120,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -103,14 +106,16 @@ 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
-@@ -19,11 +19,17 @@ import org.jni_zero.NativeMethods;
+@@ -17,6 +17,7 @@ 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;
  import org.chromium.base.ThreadUtils;
  import org.chromium.base.metrics.RecordUserAction;
+@@ -24,6 +25,11 @@ import org.chromium.base.supplier.Supplier;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
  import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
  import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.tab.Tab;
@@ -128,9 +133,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +    private static final String TAG = "BookmarkBridge";
 +
      private long mNativeBookmarkBridge;
-     private boolean mIsDestroyed;
+     private Profile mProfile;
      private boolean mIsDoingExtensiveChanges;
-@@ -424,6 +432,16 @@ class BookmarkBridge {
+@@ -411,6 +419,16 @@ class BookmarkBridge {
          return mMobileFolderId;
      }
  
@@ -147,7 +152,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();
-@@ -1114,6 +1132,50 @@ class BookmarkBridge {
+@@ -1132,6 +1150,50 @@ class BookmarkBridge {
                  .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
      }
  
@@ -198,7 +203,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Helper method to mark an item as read.
       *
-@@ -1368,6 +1430,9 @@ class BookmarkBridge {
+@@ -1339,6 +1401,9 @@ class BookmarkBridge {
          BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
                  long nativeBookmarkBridge, @JniType("GURL") GURL url);
  
@@ -208,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
  
          void getTopLevelFolderIds(
-@@ -1389,6 +1454,8 @@ class BookmarkBridge {
+@@ -1360,6 +1425,8 @@ class BookmarkBridge {
  
          BookmarkId getRootFolderId(long nativeBookmarkBridge);
  
@@ -220,7 +225,7 @@ 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
-@@ -180,7 +180,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
+@@ -185,7 +185,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
  
      JNIEnv* env = AttachCurrentThread();
      Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
@@ -229,8 +234,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
                                            result == Result::kSuccess);
      delete this;
    }
-@@ -396,6 +396,33 @@ void BookmarkBridge::GetImageUrlForBookmarkImpl(
+@@ -363,6 +363,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
-   std::move(callback).Run(GURL());
+   return bookmark_model_->account_mobile_node() != nullptr;
  }
  
 +base::android::ScopedJavaLocalRef<jobject>
@@ -263,7 +268,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  base::android::ScopedJavaLocalRef<jobject>
  BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
                                                           const GURL& url) {
-@@ -508,6 +535,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -475,6 +502,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
    // Vector to temporarily contain all child bookmarks at same level for sorting
    std::vector<const BookmarkNode*> bookmarks = {
        bookmark_model_->mobile_node(),
@@ -271,7 +276,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -601,6 +629,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+@@ -568,6 +596,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
      top_level_folders.push_back(other_node);
    }
  
@@ -281,7 +286,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
    const BookmarkNode* reading_list_node =
        local_or_syncable_reading_list_manager_->GetRoot();
    if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
-@@ -1313,6 +1344,17 @@ void BookmarkBridge::GetBookmarksOfType(
+@@ -1269,6 +1300,17 @@ void BookmarkBridge::GetBookmarksOfType(
    AddBookmarkNodesToBookmarkIdList(env, j_list, results);
  }
  
@@ -302,9 +307,9 @@ 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
-@@ -93,6 +93,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -79,6 +79,10 @@ class BookmarkBridge : public ProfileObserver,
-       bool is_account_bookmark,
+ 
-       page_image_service::ImageService::ResultCallback callback);
+   jboolean AreAccountBookmarkFoldersActive(JNIEnv* env);
  
 +  base::android::ScopedJavaLocalRef<jobject> GetBookmarkIdForTabsCollection(
 +      JNIEnv* env,
@@ -313,7 +318,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    base::android::ScopedJavaLocalRef<jobject>
    GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url);
    const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl(
-@@ -237,6 +241,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -222,6 +226,10 @@ class BookmarkBridge : public ProfileObserver,
                            const base::android::JavaParamRef<jobject>& j_list,
                            jint type);
  
@@ -327,7 +332,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
 +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
-@@ -168,7 +168,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+@@ -174,7 +174,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
      BookmarkCodec codec;
      bookmarks_ =
          codec.Encode(model->bookmark_bar_node(), model->other_node(),
@@ -337,7 +342,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
    }
  
    Writer(const Writer&) = delete;
-@@ -195,15 +196,19 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+@@ -201,15 +202,19 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
          roots->FindDict(BookmarkCodec::kOtherBookmarkFolderNameKey);
      base::Value::Dict* mobile_folder_value =
          roots->FindDict(BookmarkCodec::kMobileBookmarkFolderNameKey);
@@ -358,7 +363,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
        NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes);
        return;
      }
-@@ -467,6 +472,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
+@@ -460,6 +465,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
        BookmarkModelFactory::GetForBrowserContext(profile_)->other_node());
    ExtractUrls(
        BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node());
@@ -367,6 +372,45 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
    if (!bookmark_urls_.empty())
      FetchNextFavicon();
    else
+diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
+--- a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
++++ b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
+@@ -44,6 +44,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
+ 
+     case BookmarkNode::Type::URL:
+       NOTREACHED();
++    case BookmarkNode::Type::TABS_COLLECTION:
++      NOTREACHED();
+   }
+   NOTREACHED();
+ }
+@@ -99,6 +101,7 @@ BookmarkParentFolder BookmarkParentFolder::FromFolderNode(
+   }
+   switch (node->type()) {
+     case bookmarks::BookmarkNode::URL:
++    case bookmarks::BookmarkNode::TABS_COLLECTION:
+       NOTREACHED();
+     case bookmarks::BookmarkNode::FOLDER:
+       // TODO(crbug.com/381252292): Consider extending type with a value
+diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
+--- a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
++++ b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
+@@ -22,6 +22,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) {
+   switch (type) {
+     case bookmarks::BookmarkNode::URL:
+     case bookmarks::BookmarkNode::FOLDER:
++    case bookmarks::BookmarkNode::TABS_COLLECTION:
+       NOTREACHED();
+ 
+     case bookmarks::BookmarkNode::BOOKMARK_BAR:
+@@ -168,6 +169,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() {
+   switch (tracked_type_) {
+     case bookmarks::BookmarkNode::URL:
+     case bookmarks::BookmarkNode::FOLDER:
++    case bookmarks::BookmarkNode::TABS_COLLECTION:
+       NOTREACHED();
+ 
+     case bookmarks::BookmarkNode::BOOKMARK_BAR:
 diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
@@ -391,7 +435,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
-@@ -3979,6 +3979,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -4515,6 +4515,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>
@@ -401,10 +445,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_MENU_GET_IMAGE_DESCRIPTIONS" desc="Menu item to start getting alt text accessibility image labels/descriptions [CHAR_LIMIT=27]">
          Get image descriptions
        </message>
+diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
+--- a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
++++ b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
+@@ -137,6 +137,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
+   if (is_reorder) {
+     base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target);
+     switch (target_parent()->GetType()) {
++      case bookmarks::BookmarkNode::TABS_COLLECTION:
++        break;
+       case bookmarks::BookmarkNode::URL:
+         NOTREACHED();
+       case bookmarks::BookmarkNode::FOLDER:
 diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_strings.grdp
 --- a/components/bookmark_bar_strings.grdp
 +++ b/components/bookmark_bar_strings.grdp
-@@ -20,6 +20,9 @@
+@@ -15,6 +15,9 @@
      <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="Name shown in the tree for the mobile bookmarks folder">
        Mobile bookmarks
      </message>
@@ -414,7 +470,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
      <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder">
        Other bookmarks
      </message>
-@@ -34,6 +37,9 @@
+@@ -29,6 +32,9 @@
      <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the mobile bookmarks folder">
        Mobile Bookmarks
      </message>
@@ -427,7 +483,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";
@@ -435,7 +491,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,
@@ -443,16 +499,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(
+@@ -98,6 +100,8 @@ base::Value::Dict BookmarkCodec::Encode(
-   roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
+     roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
-   roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
+     roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
-   roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
+     roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
-+  if (tabs_folder_node)
++    if (tabs_folder_node)
-+    roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
++      roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
- 
+   } else {
-   FinalizeChecksum();
+     // No permanent node should have been provided.
-   // We are going to store the computed checksum. So set stored checksum to be
+     CHECK(!other_folder_node);
-@@ -107,6 +111,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
@@ -460,7 +516,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),
@@ -470,7 +526,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,
@@ -486,7 +542,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,
@@ -494,7 +550,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);
@@ -503,16 +559,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) {
+   // Need to reset the title as the title is persisted and restored from
-     const std::string* sync_metadata_str_base64 =
+   // the file.
-@@ -460,12 +472,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+@@ -475,12 +487,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,
@@ -531,7 +587,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
-@@ -40,6 +40,7 @@ class BookmarkCodec {
+@@ -43,6 +43,7 @@ class BookmarkCodec {
        const BookmarkNode* bookmark_bar_node,
        const BookmarkNode* other_folder_node,
        const BookmarkNode* mobile_folder_node,
@@ -539,7 +595,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
-@@ -58,6 +59,7 @@ class BookmarkCodec {
+@@ -61,6 +62,7 @@ class BookmarkCodec {
                BookmarkNode* bb_node,
                BookmarkNode* other_folder_node,
                BookmarkNode* mobile_folder_node,
@@ -547,7 +603,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -89,6 +91,7 @@ class BookmarkCodec {
+@@ -92,6 +94,7 @@ class BookmarkCodec {
    static const char kBookmarkBarFolderNameKey[];
    static const char kOtherBookmarkFolderNameKey[];
    static const char kMobileBookmarkFolderNameKey[];
@@ -555,7 +611,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[];
-@@ -121,6 +124,7 @@ class BookmarkCodec {
+@@ -124,6 +127,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -563,7 +619,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value::Dict& value,
                      std::string* sync_metadata_str);
  
-@@ -131,7 +135,8 @@ class BookmarkCodec {
+@@ -134,7 +138,8 @@ class BookmarkCodec {
    // Reassigns bookmark IDs for all nodes.
    void ReassignIDs(BookmarkNode* bb_node,
                     BookmarkNode* other_node,
@@ -576,16 +632,16 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
 diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
 --- a/components/bookmarks/browser/bookmark_load_details.cc
 +++ b/components/bookmarks/browser/bookmark_load_details.cc
-@@ -15,7 +15,7 @@ namespace {
+@@ -16,7 +16,7 @@ namespace {
  
  // Number of top-level permanent folders excluding the managed node and account
  // bookmarks.
 -constexpr size_t kNumDefaultTopLevelPermanentFolders = 3u;
 +constexpr size_t kNumDefaultTopLevelPermanentFolders = 4u;
  
- }  // namespace
+ void UpdateUserFolderStatsRecursively(const BookmarkNode& node,
- 
+                                       bool top_level,
-@@ -40,6 +40,8 @@ BookmarkLoadDetails::BookmarkLoadDetails()
+@@ -60,6 +60,8 @@ BookmarkLoadDetails::BookmarkLoadDetails()
        root_node_->Add(BookmarkPermanentNode::CreateOtherBookmarks(/*id=*/0)));
    mobile_folder_node_ = static_cast<BookmarkPermanentNode*>(
        root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks(/*id=*/0)));
@@ -594,7 +650,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
  
    CHECK_EQ(kNumDefaultTopLevelPermanentFolders, root_node_->children().size());
  }
-@@ -86,6 +88,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
+@@ -106,6 +108,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
    if (mobile_folder_node_->id() == 0) {
      mobile_folder_node_->set_id(max_id_++);
    }
@@ -605,7 +661,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
  }
  
  void BookmarkLoadDetails::AddManagedNode(
-@@ -98,6 +104,7 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -118,6 +124,7 @@ void BookmarkLoadDetails::AddManagedNode(
    CHECK_NE(bb_node_->id(), 0);
    CHECK_NE(other_folder_node_->id(), 0);
    CHECK_NE(mobile_folder_node_->id(), 0);
@@ -613,7 +669,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
  
    has_managed_node_ = true;
    root_node_->Add(std::move(managed_node));
-@@ -105,8 +112,8 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -125,8 +132,8 @@ void BookmarkLoadDetails::AddManagedNode(
  
  void BookmarkLoadDetails::CreateIndices() {
    local_or_syncable_uuid_index_.insert(root_node_.get());
@@ -624,7 +680,7 @@ 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() {
+@@ -145,6 +152,7 @@ void BookmarkLoadDetails::ResetPermanentNodePointers() {
    bb_node_ = nullptr;
    other_folder_node_ = nullptr;
    mobile_folder_node_ = nullptr;
@@ -635,7 +691,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
 diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h
 --- a/components/bookmarks/browser/bookmark_load_details.h
 +++ b/components/bookmarks/browser/bookmark_load_details.h
-@@ -40,6 +40,7 @@ class BookmarkLoadDetails {
+@@ -41,6 +41,7 @@ class BookmarkLoadDetails {
    BookmarkPermanentNode* bb_node() { return bb_node_; }
    BookmarkPermanentNode* mobile_folder_node() { return mobile_folder_node_; }
    BookmarkPermanentNode* other_folder_node() { return other_folder_node_; }
@@ -643,7 +699,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
  
    // Account permanent nodes (null unless `AddAccountPermanentNodes()` is
    // called).
-@@ -151,6 +152,7 @@ class BookmarkLoadDetails {
+@@ -156,6 +157,7 @@ class BookmarkLoadDetails {
    raw_ptr<BookmarkPermanentNode> bb_node_;
    raw_ptr<BookmarkPermanentNode> other_folder_node_;
    raw_ptr<BookmarkPermanentNode> mobile_folder_node_;
@@ -654,7 +710,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
-@@ -912,7 +912,7 @@ bool BookmarkModel::HasBookmarks() const {
+@@ -825,7 +825,7 @@ bool BookmarkModel::HasBookmarks() const {
  bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    return bookmark_bar_node_->children().empty() &&
@@ -663,7 +719,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1244,6 +1244,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1147,6 +1147,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
    bookmark_bar_node_ = details->bb_node();
    other_node_ = details->other_folder_node();
    mobile_node_ = details->mobile_folder_node();
@@ -674,7 +730,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -157,6 +157,12 @@ class BookmarkModel : public CoreBookmarkModel,
+@@ -151,6 +151,12 @@ class BookmarkModel : public BookmarkUndoProvider,
    // bookmarks in the account storage).
    const BookmarkNode* account_mobile_node() const;
  
@@ -687,7 +743,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_;
-@@ -635,6 +641,7 @@ class BookmarkModel : public CoreBookmarkModel,
+@@ -592,6 +598,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;
@@ -705,7 +761,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)));
@@ -753,8 +809,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()) {
+       // Either all permanent folders or none should exist.
-@@ -59,6 +60,7 @@ base::Value::Dict EncodeModelToDict(
+@@ -61,6 +62,7 @@ base::Value::Dict EncodeModelToDict(
        return codec.Encode(model->account_bookmark_bar_node(),
                            model->account_other_node(),
                            model->account_mobile_node(),
@@ -808,7 +864,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();
  
-@@ -122,7 +125,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -120,7 +123,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
      if (root_dict.has_value() &&
          codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
                       details->bb_node(), details->other_folder_node(),
@@ -821,7 +877,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(
+@@ -442,6 +442,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,33 +16,33 @@ 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"
+         <item android:id="@+id/universal_install"
              android:title="@string/menu_add_to_homescreen"
              android:orderInCategory="2" />
 +        <item android:id="@+id/view_source_id"
 +            android:title="@string/view_source"
 +            android:orderInCategory="2" />
-         <item android:id="@+id/install_webapp_id"
+         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_install_webapp"
+             android:title="@string/menu_open_webapk"
              android:orderInCategory="2" />
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -107,6 +107,9 @@ found in the LICENSE file.
+@@ -116,6 +116,9 @@ found in the LICENSE file.
-         <item android:id="@+id/add_to_homescreen_id"
+         <item android:id="@+id/universal_install"
              android:title="@string/menu_add_to_homescreen"
              android:icon="@drawable/ic_add_to_home_screen" />
 +        <item android:id="@+id/view_source_id"
 +            android:title="@string/view_source"
 +            android:icon="@drawable/ic_drive_document_24dp" />
-         <item android:id="@+id/install_webapp_id"
+         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_install_webapp"
+             android:title="@string/menu_open_webapk"
-             android:icon="@drawable/ic_install_webapp" />
+             android:icon="@drawable/ic_open_webapk" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2986,6 +2986,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3065,6 +3065,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                  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
-@@ -2722,6 +2722,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2518,6 +2518,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return doOpenWebApk(currentTab);
          }
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -576,6 +576,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -580,6 +580,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                          isNativePage, isFileScheme, isContentScheme, isIncognito, url));
  
          updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
@@ -77,8 +77,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  
          updateAutoDarkMenuItem(menu, currentTab, isNativePage);
  
-@@ -1286,6 +1287,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1281,6 +1282,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         }
+         findInPageMenuRow.setVisible(itemVisible);
      }
  
 +    /**
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -294,6 +294,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -303,6 +303,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  
              updateRequestDesktopSiteMenuItem(
                      menu, currentTab, requestDesktopSiteVisible, isNativePage);
@@ -115,8 +115,8 @@ 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
-@@ -319,6 +319,10 @@ CHAR_LIMIT guidelines:
+@@ -315,6 +315,10 @@ CHAR_LIMIT guidelines:
-         USB
+         Collaboration
        </message>
  
 +      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">

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 +-
- .../privacy/settings/PrivacySettings.java     | 42 ++++++++++++++++++-
+ .../privacy/settings/PrivacySettings.java     | 44 ++++++++++++++++++-
- .../browser/tab_ui/TabContentManager.java     |  6 ++-
  .../strings/android_chrome_strings.grd        |  8 ++++
- 7 files changed, 72 insertions(+), 7 deletions(-)
+ 6 files changed, 70 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -330,9 +330,12 @@ class TabGridViewBinder {
+@@ -408,7 +408,12 @@ class TabGridViewBinder {
-                         // Adjust bitmap to thumbnail.
+                     if (result != null) {
-                         TabUtils.setBitmapAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
+                         TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
-                     } else if (isMostRecentRequest) {
+                     } else {
--                        // If the most recent request is a null bitmap ensure a placeholder is
--                        // visible.
 -                        thumbnail.setImageDrawable(null);
 +                        TabListFaviconProvider.TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
 +                        if (tabFavicon != null) {
@@ -32,18 +29,18 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -371,6 +374,7 @@ class TabGridViewBinder {
+@@ -449,6 +454,7 @@ class TabGridViewBinder {
-             ViewLookupCachingFrameLayout rootView,
+      */
-             PropertyModel model,
+     private static void setFavicon(
-             TabListFaviconProvider.TabFavicon favicon) {
+             ImageView faviconView, PropertyModel model, TabListFaviconProvider.TabFavicon favicon) {
 +        model.set(TabProperties.FAVICON, favicon);
-         ImageView faviconView = (ImageView) rootView.fastFindViewById(R.id.tab_favicon);
          if (favicon == null) {
              faviconView.setImageDrawable(null);
+             return;
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
-@@ -64,6 +64,9 @@ public class TabProperties {
+@@ -72,6 +72,9 @@ public class TabProperties {
      public static final WritableBooleanPropertyKey FAVICON_FETCHED =
              new WritableBooleanPropertyKey();
  
@@ -53,26 +50,26 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /** Property for lazily fetching favicons when required by an item in a UI. */
      public static final WritableObjectPropertyKey<TabListFaviconProvider.TabFaviconFetcher>
              FAVICON_FETCHER = new WritableObjectPropertyKey<>();
-@@ -165,6 +168,7 @@ public class TabProperties {
+@@ -155,6 +158,7 @@ public class TabProperties {
                  CARD_TYPE,
-                 CONTENT_DESCRIPTION_STRING,
+                 CONTENT_DESCRIPTION_TEXT_RESOLVER,
-                 CLOSE_BUTTON_DESCRIPTION_STRING,
+                 ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
 +                FAVICON,
                  SHOPPING_PERSISTED_TAB_DATA_FETCHER,
                  SHOULD_SHOW_PRICE_DROP_TOOLTIP,
                  QUICK_DELETE_ANIMATION_STATUS,
-@@ -178,6 +182,7 @@ public class TabProperties {
+@@ -173,6 +177,7 @@ public class TabProperties {
-                 TAB_CLOSED_LISTENER,
+                 TAB_ACTION_BUTTON_DATA,
                  FAVICON_FETCHED,
                  FAVICON_FETCHER,
 +                FAVICON,
                  IS_SELECTED,
                  TITLE,
-                 TABSTRIP_FAVICON_BACKGROUND_COLOR_ID,
+                 HAS_NOTIFICATION_BUBBLE
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -65,6 +65,11 @@ found in the LICENSE file.
+@@ -78,6 +78,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,34 +84,42 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -144,6 +144,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+@@ -140,6 +140,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.printing.TabPrinter;
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
  import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.profiles.ProfileManager;
  import org.chromium.chrome.browser.profiles.ProfileProvider;
- import org.chromium.chrome.browser.readaloud.ReadAloudController;
+@@ -615,7 +616,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-@@ -730,7 +731,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/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -68,12 +68,25 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -21,6 +21,7 @@ import androidx.preference.Preference;
+ 
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.metrics.RecordUserAction;
++import org.chromium.base.supplier.Supplier;
+ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplierImpl;
+ import org.chromium.base.ContextUtils;
+@@ -79,12 +80,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
-+import org.chromium.chrome.browser.ApplicationLifetime;
++import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +
  import java.util.ArrayList;
  import java.util.List;
@@ -123,18 +128,19 @@ 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 Supplier<SnackbarManager> mSnackbarManagerSupplier;
 +    private Snackbar mSnackbar;
 +
 +    @Override
-+    public void setSnackbarManager(SnackbarManager manager) {
++    public void setSnackbarManagerSupplier(Supplier<SnackbarManager> manager) {
-+        mSnackbarManager = manager;
++        mSnackbarManagerSupplier = manager;
 +    }
 +
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_PRELOAD_PAGES = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -155,6 +168,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -175,6 +190,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -156,7 +162,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
          // Record the launch of PG from the S&P link-row entry point
          privacyGuidePreference.setOnPreferenceClickListener(
-@@ -345,6 +373,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -405,6 +435,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
  
      public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
      public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -164,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -370,6 +399,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -451,6 +482,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -172,13 +178,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_TABGRID_USE_ICONS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-+            if (!mSnackbarManager.isShowing()) {
++            if (!mSnackbarManagerSupplier.get().isShowing()) {
-+                mSnackbarManager.showSnackbar(mSnackbar);
++                mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
 +            }
          }
          return true;
      }
-@@ -418,6 +454,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -517,6 +555,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              : R.string.text_off);
          }
  
@@ -189,26 +195,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference refererPolicyPref = findPreference(PREF_REFERER_POLICY);
          refererPolicyPref.setSummary(
                  RefererSettingsFragment.getRefererSummaryString(getContext()));
-diff --git a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java b/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
---- a/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
-+++ b/chrome/browser/tab_ui/android/java/src/org/chromium/chrome/browser/tab_ui/TabContentManager.java
-@@ -328,8 +328,10 @@ public class TabContentManager {
-             @NonNull Callback<Bitmap> callback,
-             boolean forceUpdate,
-             boolean writeBack) {
--        if (!mSnapshotsEnabled) return;
--
-+        if (!mSnapshotsEnabled) {
-+            callback.onResult(null);
-+            return;
-+        }
-         // TODO(crbug/1444782): Remove forceUpdate and writeBack params once the following features
-         // launch:
-         // * GridTabSwitcherAndroidAnimations
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5436,6 +5436,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -6014,6 +6014,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
          Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
        </message>
  
@@ -217,7 +207,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +        Use only icons in the tab grid
 +      </message>
 +      <message name="IDS_TABGRID_USE_ICONS_SUMMARY" desc="Summary text for 'Use icons in the tab grid' settings-privacy option.">
-+        Disable the saving of snapshots to disk
++        Disable saving snapshots to disk (even for incognito sessions)
 +      </message>
 +
        <!-- Tab Group Tab Switcher strings -->

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

@@ -4,64 +4,41 @@ Subject: Add option to force tablet UI
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../start_surface/StartSurfaceMediator.java   |  5 +++-
  .../layout/custom_tabs_control_container.xml  |  2 +-
  .../java/res/layout/recent_tabs_page.xml      |  2 +-
- .../java/res/values-sw600dp/dimens.xml        |  4 +--
+ .../java/res/values-sw600dp/dimens.xml        |  4 ++--
- chrome/android/java/res/values/dimens.xml     |  6 +++-
+ chrome/android/java/res/values/dimens.xml     |  6 +++++-
- .../chrome/browser/ChromeTabbedActivity.java  |  4 ++-
+ .../browser/ChromeBaseAppCompatActivity.java  |  3 +++
- .../chrome/browser/WarmupManager.java         |  5 +++-
+ .../chrome/browser/WarmupManager.java         |  5 ++++-
- .../settings/AccessibilitySettings.java       | 13 +++++++++
+ .../ChromeAccessibilitySettingsDelegate.java  | 19 ++++++++++++++++++
- .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++
+ .../chrome/browser/app/ChromeActivity.java    |  4 +++-
- .../chrome/browser/app/ChromeActivity.java    |  4 ++-
+ .../overlays/strip/StripLayoutHelper.java     | 10 ++++++++--
- .../overlays/strip/StripLayoutHelper.java     | 10 +++++--
+ .../strip/StripLayoutHelperManager.java       |  6 +++++-
- .../strip/StripLayoutHelperManager.java       |  7 ++++-
+ .../init/ChromeBrowserInitializer.java        |  2 ++
- .../browser/tasks/ReturnToChromeUtil.java     |  4 ++-
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +++-
- .../chrome/browser/ui/RootUiCoordinator.java  |  5 +++-
+ .../chrome/browser/ui/RootUiCoordinator.java  |  6 +++++-
  chrome/browser/preferences/BUILD.gn           |  1 +
  .../preferences/ChromePreferenceKeys.java     |  1 +
- .../preferences/ChromeSharedPreferences.java  |  8 ++++++
+ .../preferences/ChromeSharedPreferences.java  | 12 +++++++++++
  .../LegacyChromePreferenceKeys.java           |  1 +
- .../SingleTabSwitcherOnNtpMediator.java       |  3 +-
+ .../AppHeaderCoordinator.java                 |  2 ++
  .../omnibox/LocationBarCoordinator.java       |  2 +-
- .../strings/android_chrome_strings.grd        |  7 +++++
+ .../strings/android_chrome_strings.grd        |  7 +++++++
- .../java/res/layout/control_container.xml     | 12 ++++----
+ .../java/res/layout/control_container.xml     |  8 ++++----
  .../java/res/layout/toolbar_tablet.xml        |  2 +-
- .../java/res/values-sw600dp/dimens.xml        |  5 ++--
+ .../java/res/values-sw600dp/dimens.xml        |  5 +++--
- .../toolbar/java/res/values/dimens.xml        |  5 ++--
+ .../toolbar/java/res/values/dimens.xml        |  6 ++++--
  .../browser/toolbar/ControlContainer.java     |  2 +-
- .../browser/toolbar/ToolbarFeatures.java      |  4 ++-
+ .../toolbar/top/ToolbarControlContainer.java  | 20 ++++++++++++++++++-
- .../top/TabStripTransitionCoordinator.java    |  2 +-
+ .../browser/toolbar/top/ToolbarLayout.java    |  5 ++++-
- .../toolbar/top/ToolbarControlContainer.java  | 28 ++++++++++++++++++-
+ .../tab_strip/HeightTransitionHandler.java    |  2 ++
- .../browser/toolbar/top/ToolbarLayout.java    |  5 +++-
+ .../TabStripTransitionCoordinator.java        |  6 +++++-
- components/BUILD.gn                           |  6 ++--
+ .../res/xml/accessibility_preferences.xml     |  5 +++++
- .../res/xml/accessibility_preferences.xml     |  5 ++++
+ .../accessibility/AccessibilitySettings.java  | 13 ++++++++++++
- .../AccessibilitySettingsDelegate.java        | 11 ++++++++
+ .../AccessibilitySettingsDelegate.java        |  2 ++
- .../chromium/ui/base/DeviceFormFactor.java    |  9 ++++++
+ .../chromium/ui/base/DeviceFormFactor.java    | 14 +++++++++++++
- 34 files changed, 174 insertions(+), 35 deletions(-)
+ 33 files changed, 163 insertions(+), 26 deletions(-)
 
-diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
---- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -100,6 +100,7 @@ import org.chromium.components.browser_ui.widget.gesture.BackPressHandler;
- import org.chromium.components.embedder_support.util.UrlUtilities;
- import org.chromium.components.prefs.PrefService;
- import org.chromium.content_public.browser.LoadUrlParams;
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.ui.text.EmptyTextWatcher;
- import org.chromium.ui.util.ColorUtils;
-@@ -1134,7 +1135,9 @@ class StartSurfaceMediator
-     int getTopToolbarPlaceholderHeight() {
-         // If logo is visible in Start surface instead of in the toolbar, we don't need to show the
-         // top margin of the fake search box.
--        return getPixelSize(R.dimen.control_container_height)
-+        return DeviceFormFactor.isForceTabletUI()
-+                    ? getPixelSize(R.dimen.control_container_height_tabletui)
-+                    : getPixelSize(R.dimen.control_container_height_cromite)
-                 + (isLogoVisible()
-                         ? 0
-                         : getPixelSize(R.dimen.start_surface_fake_search_box_top_margin));
 diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
 --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
 +++ b/chrome/android/java/res/layout/custom_tabs_control_container.xml
@@ -99,52 +76,58 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
 +    <dimen name="control_container_height_tabletui">96dp</dimen>
  
      <!-- NTP dimensions -->
-     <dimen name="ntp_search_box_transition_length">60dp</dimen>
+     <dimen name="ntp_search_box_transition_start_offset">60dp</dimen>
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -123,9 +123,13 @@ found in the LICENSE file.
+@@ -125,9 +125,13 @@ found in the LICENSE file.
      <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
  
      <!-- Should match toolbar_height_no_shadow -->
--    <dimen name="control_container_height">56dp</dimen>
+-    <dimen name="control_container_height">@dimen/default_action_bar_height</dimen>
-+    <dimen name="control_container_height_cromite">56dp</dimen>
++    <dimen name="control_container_height_cromite">@dimen/default_action_bar_height</dimen>
 +    <dimen name="control_container_height_tabletui">96dp</dimen>
-     <dimen name="custom_tabs_control_container_height">56dp</dimen>
+     <dimen name="custom_tabs_control_container_height">@dimen/default_action_bar_height</dimen>
  
 +    <!-- The combined height of the tab strip and toolbar. -->
 +    <dimen name="tab_strip_and_toolbar_height_cromite">56dp</dimen>
 +
      <!-- Find in Page dimensions -->
      <dimen name="find_in_page_popup_width">375dp</dimen>
-     <dimen name="find_in_page_popup_height">60dp</dimen>
+     <dimen name="find_in_page_popup_height">64dp</dimen>
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-@@ -2265,7 +2265,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -57,6 +57,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
+ import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
+ import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
+ import org.chromium.chrome.browser.night_mode.NightModeUtils;
++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
+ import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager;
+ import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
+@@ -128,6 +129,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
+     protected void attachBaseContext(Context newBase) {
+         super.attachBaseContext(newBase);
  
-     @Override
++        ChromeSharedPreferences.warmUp();
-     public int getControlContainerHeightResource() {
++
--        return R.dimen.control_container_height;
+         // Make sure the "chrome" split is loaded before checking if ClassLoaders are equal.
-+        if (DeviceFormFactor.isForceTabletUI())
+         SplitChromeApplication.finishPreload(CHROME_SPLIT_NAME);
-+            return R.dimen.control_container_height_tabletui;
+         ClassLoader chromeModuleClassLoader = ChromeBaseAppCompatActivity.class.getClassLoader();
-+        return R.dimen.control_container_height_cromite;
-     }
- 
-     @Override
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-@@ -51,6 +51,7 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -63,6 +63,7 @@ import org.chromium.content_public.browser.WebContents;
- 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;
-@@ -384,7 +385,9 @@ public class WarmupManager {
+@@ -473,7 +474,9 @@ public class WarmupManager {
-                     (ControlContainer) mainView.findViewById(R.id.control_container);
+             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
  
              if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
 -                controlContainer.initWithToolbar(toolbarId);
@@ -154,66 +137,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
              }
              return mainView;
          } catch (InflateException e) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -17,6 +17,7 @@ import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsControlle
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
-+import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
- import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
-@@ -46,6 +47,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     public static final String PREF_ZOOM_INFO = "zoom_info";
-     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
- 
-+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
-+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
-+
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -143,6 +147,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-                 mPrefService.getBoolean(Pref.READER_FOR_ACCESSIBILITY));
-         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
- 
-+        ChromeSwitchPreference forceTabletUiPref =
-+                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
-+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
-+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
-+        forceTabletUiPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -214,6 +224,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
-         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
-             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
-+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
-+            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
-+            mDelegate.requestRestart(getActivity());
-         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
-             mPrefService.setBoolean(Pref.READER_FOR_ACCESSIBILITY, (Boolean) newValue);
-         } else if (PREF_PAGE_ZOOM_DEFAULT_ZOOM.equals(preference.getKey())) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -38,6 +38,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -62,6 +62,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
          }
      }
  
 +    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
 +        @Override
-+        public boolean isEnabled() {
++        public boolean getValue() {
 +            return ChromeSharedPreferences.getInstance().readBoolean(
 +                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false);
 +        }
 +
 +        @Override
-+        public void setEnabled(boolean value) {
++        public void setValue(boolean value) {
 +            ChromeSharedPreferences.getInstance().writeBoolean(
 +                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value);
 +        }
@@ -230,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -874,7 +874,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -757,7 +757,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              // Inflate the correct toolbar layout for the device.
              int toolbarLayoutId = getToolbarLayoutId();
              if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -244,15 +183,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -69,6 +69,7 @@ import org.chromium.chrome.browser.tasks.tab_management.TabUiThemeUtil;
+@@ -112,6 +112,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
- import org.chromium.components.browser_ui.styles.ChromeColors;
+ import org.chromium.components.tab_group_sync.TabGroupSyncService;
- import org.chromium.components.browser_ui.styles.SemanticColorUtils;
  import org.chromium.components.tab_groups.TabGroupColorId;
+ import org.chromium.ui.MotionEventUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.interpolators.Interpolators;
+ import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -4576,8 +4577,13 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
+@@ -3999,8 +4000,13 @@ public class StripLayoutHelper
          mTabMenu.setAnchorView(tabView);
          // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
          int tabHeight = mManagerHost.getHeight();
@@ -271,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.ui.system.StatusBarColorController;
+@@ -91,6 +91,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
  import org.chromium.components.browser_ui.styles.SemanticColorUtils;
  import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
  import org.chromium.content_public.browser.LoadUrlParams;
@@ -279,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.PageTransition;
  import org.chromium.ui.base.WindowAndroid;
-@@ -396,11 +397,15 @@ public class StripLayoutHelperManager
+@@ -438,7 +439,10 @@ public class StripLayoutHelperManager
  
          mIsLayoutOptimizationsEnabled =
                  ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
@@ -291,37 +230,52 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
          mHeight =
                  mIsLayoutOptimizationsEnabled
                          ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
-                         : mScrollableStripHeight;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
-+
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
-         mTopPadding = mHeight - mScrollableStripHeight;
++++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+@@ -17,6 +17,7 @@ import org.chromium.base.library_loader.LibraryProcessType;
+ import org.chromium.base.task.ChainedTasks;
+ import org.chromium.base.task.TaskTraits;
+ import org.chromium.chrome.browser.flags.ChromeSwitches;
++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.profiles.ProfileManager;
+ import org.chromium.chrome.browser.signin.SigninCheckerProvider;
+ import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
+@@ -107,6 +108,7 @@ public class ChromeBrowserInitializer {
+     public void handlePreNativeStartupAndLoadLibraries(final BrowserParts parts) {
+         ThreadUtils.checkUiThread();
+         if (parts.isActivityFinishingOrDestroyed()) return;
++        ChromeSharedPreferences.warmUp();
+         ProcessInitializationHandler.getInstance().initializePreNative();
+         ProcessInitializationHandler.getInstance().initializePreNativeLibraryLoad();
+         try (TraceEvent e = TraceEvent.scoped("ChromeBrowserInitializer.preInflationStartup")) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+@@ -602,7 +602,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
-         CompositorOnClickHandler selectorClickHandler = time -> handleModelSelectorButtonClick();
+     @Override
-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
+     public int getControlContainerHeightResource() {
---- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
+-        return R.dimen.control_container_height;
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
++        if (DeviceFormFactor.isForceTabletUI())
-@@ -933,7 +933,9 @@ public final class ReturnToChromeUtil {
++            return R.dimen.control_container_height_tabletui;
-         // TODO(b/331667743): Clean up the flag for scrollable mvt while cleaning up surface polish
++        return R.dimen.control_container_height_cromite;
-         // code.
+     }
-         boolean isSurfacePolishEnabled = ChromeFeatureList.sSurfacePolish.isEnabled();
+ 
--        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context)) {
+     @Override
-+        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) ||
-+             ChromeSharedPreferences.getInstance().readBoolean(
-+                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) {
-             // On phones, parameter SURFACE_POLISH_SCROLLABLE_MVT is checked when feature flag
-             // surface polish is enabled; otherwise, feature flag
-             // SHOW_SCROLLABLE_MVT_ON_NTP_PHONE_ANDROID is checked.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -105,6 +105,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.pdf.PdfPage;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ 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;
+@@ -1788,7 +1790,9 @@ public class RootUiCoordinator
- import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -1630,7 +1631,9 @@ public class RootUiCoordinator
          if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
  
          int stubId = R.id.find_toolbar_stub;
@@ -335,8 +289,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
-@@ -26,6 +26,7 @@ android_library("java") {
+@@ -25,6 +25,7 @@ android_library("java") {
-     "//components/browser_ui/site_settings/android:constants_java",
+     "//components/cached_flags:java",
      "//third_party/androidx:androidx_annotation_annotation_java",
      "//third_party/jni_zero:jni_zero_java",
 +    "//ui/android:ui_java",
@@ -346,10 +300,10 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -264,6 +264,7 @@ public final class ChromePreferenceKeys {
+@@ -274,6 +274,7 @@ public final class ChromePreferenceKeys {
-             AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
+     /** Whether the app-specific history info text was already seen by users. */
- 
+     public static final String HISTORY_APP_SPECIFIC_INFO_SEEN =
-     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
+             "Chrome.History.AppSpecificInfoSeen";
 +    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";
  
      /** Keys used to save settings related to homepage. */
@@ -366,7 +320,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  @JNINamespace("android::shared_preferences")
  public class ChromeSharedPreferences {
      public static final PreferenceKeyRegistry REGISTRY =
-@@ -23,6 +25,12 @@ public class ChromeSharedPreferences {
+@@ -23,6 +25,16 @@ public class ChromeSharedPreferences {
                              LegacyChromePreferenceKeys.getPrefixesInUse())
                      : null);
  
@@ -375,6 +329,10 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 +            ChromeSharedPreferences.getInstance().readBoolean(
 +                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false));
 +    }
++
++    public static void warmUp() {
++        // intentionally empty
++    }
 +
      /**
       * @return The //base SharedPreferencesManager singleton.
@@ -382,38 +340,37 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -58,6 +58,7 @@ public class LegacyChromePreferenceKeys {
+@@ -55,6 +55,7 @@ public class LegacyChromePreferenceKeys {
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE,
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP,
                  ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
-                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
-                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
 +                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,
-                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
+                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
-diff --git a/chrome/browser/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
+diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
---- a/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
+--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-+++ b/chrome/browser/single_tab/android/java/src/org/chromium/chrome/browser/single_tab/SingleTabSwitcherOnNtpMediator.java
++++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-@@ -40,6 +40,7 @@ import org.chromium.components.browser_ui.widget.displaystyle.HorizontalDisplayS
+@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing
- import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
+ import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
- import org.chromium.components.browser_ui.widget.displaystyle.UiConfig.DisplayStyle;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
- import org.chromium.components.embedder_support.util.UrlUtilities;
+ import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
+ import org.chromium.ui.InsetObserver;
- import org.chromium.url.GURL;
+ import org.chromium.ui.InsetObserver.WindowInsetsConsumer;
+ import org.chromium.ui.InsetsRectProvider;
+@@ -259,6 +260,7 @@ public class AppHeaderCoordinator
+     private static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
+             InsetsRectProvider insetsRectProvider,
+             @DesktopWindowHeuristicResult int currentResult) {
++        if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW;
+         @DesktopWindowHeuristicResult int newResult;
  
-@@ -90,7 +91,7 @@ public class SingleTabSwitcherOnNtpMediator implements ConfigurationChangedObser
+         Insets captionBarInset = insetsRectProvider.getCachedInset();
-         mSingleTabCardClickedCallback = singleTabCardClickedCallback;
-         mIsSurfacePolishEnabled = tabContentManager != null;
-         mUiConfig = uiConfig;
--        mIsTablet = isTablet;
-+        mIsTablet = isTablet && !DeviceFormFactor.isForceTabletUI();
-         mModuleDelegate = moduleDelegate;
- 
-         mMarginNarrowWindowOnTablet =
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
-@@ -768,7 +768,7 @@ public class LocationBarCoordinator
+@@ -814,7 +814,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -425,7 +382,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1618,6 +1618,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a
          Hide your IP address
        </message>
  
@@ -478,23 +435,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
              android:layout_width="match_parent"
              android:layout_height="@dimen/toolbar_height_no_shadow"
              android:layout="@layout/find_toolbar" />
-@@ -55,14 +55,14 @@ found in the LICENSE file.
-         android:id="@+id/target_view_stub"
-         android:inflatedId="@+id/toolbar_drag_drop_target_view"
-         android:layout_width="match_parent"
--        android:layout_marginTop="@dimen/tab_strip_height"
-+        android:layout_marginTop="@dimen/tab_strip_height_cromite"
-         android:layout_height="@dimen/toolbar_height_no_shadow"
-         android:layout="@layout/drag_drop_target_view" />
- 
-     <ViewStub
-         android:id="@+id/tab_switcher_toolbar_stub"
-         android:layout_width="match_parent"
--        android:layout_marginTop="@dimen/tab_strip_height"
-+        android:layout_marginTop="@dimen/tab_strip_height_cromite"
-         android:layout_height="@dimen/toolbar_height_no_shadow"
-         android:inflatedId="@+id/tab_switcher_toolbar"
-         android:layout="@layout/tab_switcher_toolbar" />
 diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
@@ -523,7 +463,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xm
 diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
 --- a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
-@@ -10,8 +10,9 @@ found in the LICENSE file.
+@@ -10,8 +10,10 @@ found in the LICENSE file.
      <dimen name="toolbar_tab_count_text_size_2_digit">10dp</dimen>
  
      <!-- Tab Strip Dimensions -->
@@ -532,13 +472,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 +    <dimen name="tab_strip_height_cromite">0dp</dimen>
 +    <dimen name="tab_strip_height_tabletui">40dp</dimen>
 +    <dimen name="tab_strip_reserved_top_padding_cromite">0dp</dimen>
++    <dimen name="tab_strip_reserved_top_padding_tabletui">2dp</dimen>
+ 
+     <dimen name="ntp_search_box_height">64dp</dimen>
  
-     <!-- Negative vertical inset added to the search box bounds when modern is enabled. 4dp is added
-          to both the top and bottom bounds to bring the 48dp modern_toolbar_background_size to 56dp
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-@@ -20,7 +20,7 @@ public interface ControlContainer {
+@@ -23,7 +23,7 @@ public interface ControlContainer {
       * Initialize the control container with the specified toolbar.
       * @param toolbarLayoutId The ID of the toolbar layout to use.
       */
@@ -547,39 +488,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
      /**
       * @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ToolbarFeatures.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.toolbar;
- import androidx.annotation.OptIn;
- import androidx.core.os.BuildCompat;
- 
-+import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.base.ResettersForTesting;
- import org.chromium.base.cached_flags.BooleanCachedFieldTrialParameter;
- import org.chromium.base.cached_flags.IntCachedFieldTrialParameter;
-@@ -71,7 +72,8 @@ public final class ToolbarFeatures {
-      *     is enabled.
-      */
-     public static boolean isDynamicTopChromeEnabled() {
--        return ChromeFeatureList.sDynamicTopChrome.isEnabled();
-+        return ChromeFeatureList.sDynamicTopChrome.isEnabled()
-+                && !DeviceFormFactor.isForceTabletUI();
-     }
- 
-     /** Returns if we are using optimized window layout for tab strip. */
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TabStripTransitionCoordinator.java
-@@ -144,7 +144,7 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks {
-         mTabStripReservedTopPadding =
-                 controlContainerView()
-                         .getResources()
--                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding);
-+                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding_cromite);
- 
-         mOnLayoutChangedListener =
-                 (view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -591,7 +499,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import android.graphics.Canvas;
  import android.graphics.PorterDuff;
  import android.graphics.Rect;
-@@ -112,8 +113,33 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
+@@ -143,8 +144,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
      }
  
      @Override
@@ -614,14 +522,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 +                view = findViewById(R.id.find_toolbar_stub);
 +                if (view != null)
 +                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
-+
-+                view = findViewById(R.id.target_view_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
-+
-+                view = findViewById(R.id.tab_switcher_toolbar_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
 +            }
              mToolbarContainer =
                      (ToolbarViewResourceFrameLayout) findViewById(R.id.toolbar_container);
@@ -629,15 +529,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.HostSurface;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils;
  import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
- import org.chromium.ui.UiUtils;
+ import org.chromium.components.feature_engagement.Tracker;
  import org.chromium.ui.base.ViewUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.util.TokenHolder;
  import org.chromium.url.GURL;
  
-@@ -588,7 +589,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -648,42 +548,54 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
      }
  
      /** Triggered when the content view for the specified tab has changed. */
-diff --git a/components/BUILD.gn b/components/BUILD.gn
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
---- a/components/BUILD.gn
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
-+++ b/components/BUILD.gn
++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
-@@ -69,7 +69,7 @@ if (is_ios) {
+@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
+ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
+ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
+ import org.chromium.ui.base.ViewUtils;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
+ import org.chromium.ui.util.TokenHolder;
  
- # Omit Lacros because it allows //components to depend on //chrome, which in
+@@ -544,6 +545,7 @@ class HeightTransitionHandler {
- # turn depends on //extensions.
+         if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
--if (!is_chromeos_lacros) {
+             return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
-+if (!is_chromeos_lacros && !is_android) {
+         }
-   disallowed_extension_deps_ = [
++        if (DeviceFormFactor.isForceTabletUI()) return 0;
-     # Components should largely not depend on //extensions. Since // extensions
+         return TRANSITION_THRESHOLD_DP;
-     # is not a component target and is linked with //chrome, depending on most
-@@ -839,7 +839,7 @@ test("components_unittests") {
-   # On other platforms, no components should depend on Chrome.
-   # Since //chrome depends on //extensions, we also only assert_no_deps on
-   # extensions targets for non-lacros builds.
--  if (!is_chromeos_lacros) {
-+  if (!is_chromeos_lacros  && !is_android) {
-     assert_no_deps = [ "//chrome/*" ]
-     assert_no_deps += disallowed_extension_deps_
-   }
-@@ -1124,7 +1124,7 @@ if (use_blink) {
-     # dependency. On other platforms, no components should depend on Chrome.
-     # Since //chrome depends on //extensions, we also only assert_no_deps on
-     # extensions targets for non-lacros builds.
--    if (!is_chromeos_lacros) {
-+    if (!is_chromeos_lacros  && !is_android) {
-       assert_no_deps = [ "//chrome/*" ]
-       assert_no_deps += disallowed_extension_deps_
      }
+ 
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
+@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+ import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver;
++import org.chromium.ui.base.DeviceFormFactor;
+ 
+ /** Class used to manage tab strip visibility and height updates. */
+ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver {
+@@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+         mTabStripReservedTopPadding =
+                 controlContainerView()
+                         .getResources()
+-                        .getDimensionPixelSize(R.dimen.tab_strip_reserved_top_padding);
++                        .getDimensionPixelSize(
++                            DeviceFormFactor.isForceTabletUI()
++                                ? R.dimen.tab_strip_reserved_top_padding_tabletui
++                                : R.dimen.tab_strip_reserved_top_padding_cromite);
+ 
+         mOnLayoutChangedListener =
+                 (view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -40,6 +40,11 @@ found in the LICENSE file.
+@@ -41,6 +41,11 @@ found in the LICENSE file.
-         android:summary="@string/reader_for_accessibility_summary"
+         android:summary="@string/jump_start_omnibox_summary"
-         android:title="@string/reader_for_accessibility_title" />
+         android:title="@string/jump_start_omnibox_title" />
  
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="force_tablet_ui"
@@ -693,42 +605,70 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
      <Preference
          android:key="captions"
          android:title="@string/accessibility_captions_title"/>
+diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
++++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+@@ -25,6 +25,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
+ import org.chromium.content_public.browser.ContentFeatureMap;
+ 
+ import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
++import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
+ 
+ /** Fragment to keep track of all the accessibility related preferences. */
+ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -39,6 +40,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public static final String PREF_ZOOM_INFO = "zoom_info";
+     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
+ 
++    private BooleanPreferenceDelegate mForceTabletUIDelegate;
++    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
++
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -105,6 +109,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+                 mDelegate.getReaderAccessibilityDelegate().getValue());
+         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
+ 
++        ChromeSwitchPreference forceTabletUiPref =
++                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
++        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
++        forceTabletUiPref.setChecked(mForceTabletUIDelegate.getValue());
++        forceTabletUiPref.setOnPreferenceChangeListener(this);
++
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -165,6 +175,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public boolean onPreferenceChange(Preference preference, Object newValue) {
+         if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
+             mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);
++        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
++            mForceTabletUIDelegate.setValue((Boolean) newValue);
++            mDelegate.requestRestart(getActivity());
+         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
+             mDelegate.getReaderAccessibilityDelegate().setValue((Boolean) newValue);
+         } else if (PREF_PAGE_ZOOM_DEFAULT_ZOOM.equals(preference.getKey())) {
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -11,6 +11,15 @@ import org.chromium.content_public.browser.BrowserContextHandle;
+@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate {
-  * 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();
 +
      /**
-      * @return the InterPreferenceDelegate instance that should be used for reading and setting the
+      * @return boolean value specifying if the Image Descriptions user setting should be shown.
-      * 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,14 @@ public class DeviceFormFactor {
+@@ -69,6 +69,14 @@ public class DeviceFormFactor {
-     /** Matches the value set in res/values-sw720dp/values.xml */
+         return BuildConfig.IS_DESKTOP_ANDROID;
-     private static final int SCREEN_BUCKET_LARGET_TABLET = 3;
+     }
  
-+    private static boolean mForceTabletUI = true;
++    private static boolean mForceTabletUI = false;
 +    public static void setForceTabletUI(boolean forceTabletUI) {
 +        mForceTabletUI = forceTabletUI;
 +    }
@@ -738,13 +678,53 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
 +
      /**
       * Each activity could be on a different display, and this will just tell you whether the
-      * display associated with the application context is "tablet sized".
+      * display associated with the application context is "tablet sized". Use {@link
-@@ -56,6 +64,7 @@ public class DeviceFormFactor {
+@@ -77,6 +85,7 @@ public class DeviceFormFactor {
-      *         E.g. http://developer.samsung.com/samsung-dex/testing
+     @CalledByNative
+     @Deprecated
+     public static boolean isTablet() {
++        if (mForceTabletUI) return true;
+         if (sIsTabletForTesting != null) {
+             return sIsTabletForTesting;
+         }
+@@ -107,6 +116,7 @@ public class DeviceFormFactor {
+      *     E.g. http://developer.samsung.com/samsung-dex/testing
       */
      public static boolean isNonMultiDisplayContextOnTablet(Context context) {
 +        if (mForceTabletUI) return true;
          return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
      }
  
+@@ -142,6 +152,7 @@ public class DeviceFormFactor {
+      * @return The screen width bucket the device is in (see constants at the top of this class).
+      */
+     private static int detectScreenWidthBucket(Context context) {
++        if (mForceTabletUI) return SCREEN_BUCKET_TABLET;
+         return context.getResources().getInteger(R.integer.min_screen_width_bucket);
+     }
+ 
+@@ -149,6 +160,7 @@ public class DeviceFormFactor {
+         ThreadUtils.assertOnUiThread();
+         Context context = windowAndroid.getContext().get();
+         if (context == null) return 0;
++        if (mForceTabletUI) return SCREEN_BUCKET_TABLET;
+         return context.getResources().getInteger(R.integer.min_screen_width_bucket);
+     }
+ 
+@@ -158,6 +170,7 @@ public class DeviceFormFactor {
+      */
+     @UiThread
+     public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
++        if (mForceTabletUI) return 0;
+         return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
+     }
+ 
+@@ -166,6 +179,7 @@ public class DeviceFormFactor {
+      *         layout.
+      */
+     public static int getMinimumTabletWidthPx(DisplayAndroid display) {
++        if (mForceTabletUI) return 0;
+         return DisplayUtil.dpToPx(display, DeviceFormFactor.MINIMUM_TABLET_WIDTH_DP);
+     }
+ }
 --

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
-@@ -82,6 +82,11 @@ found in the LICENSE file.
+@@ -102,6 +102,11 @@ found in the LICENSE file.
          android:title="@string/incognito_settings_title"
          android:summary="@string/incognito_settings_summary"
          android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,17 +28,17 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -41,6 +41,7 @@ import org.chromium.base.BuildInfo;
+@@ -44,6 +44,7 @@ import org.chromium.base.Callback;
- import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
+ import org.chromium.base.CallbackUtils;
  import org.chromium.base.CommandLine;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.IntentUtils;
  import org.chromium.base.Log;
  import org.chromium.base.MemoryPressureListener;
-@@ -1614,8 +1615,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1652,8 +1653,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
              boolean hadCipherData =
-                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
+                     CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
  
 +            String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
              boolean noRestoreState =
@@ -58,26 +58,26 @@ 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;
+ import android.text.style.ClickableSpan;
-@@ -21,6 +22,8 @@ import androidx.preference.Preference;
+@@ -22,6 +23,8 @@ import org.chromium.base.metrics.RecordHistogram;
- 
- import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplierImpl;
 +import org.chromium.base.ContextUtils;
 +import org.chromium.base.BuildInfo;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -88,6 +91,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -94,6 +97,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final SharedPreferencesManager mSharedPreferencesManager =
              ChromeSharedPreferences.getInstance();
  
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
 +
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
-     private static final String PREF_IP_PROTECTION = "ip_protection";
+     @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection";
-     @VisibleForTesting static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+     @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection";
-@@ -295,7 +300,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -346,7 +351,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -89,8 +89,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
-         } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
+         } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
-@@ -349,6 +358,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -422,6 +431,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              getContext(), getProfile()));
          }
  
@@ -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
-@@ -4918,6 +4918,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -5539,6 +5539,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>
@@ -113,7 +113,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +        Close all open tabs on exit
 +      </message>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
-+        Don't persist tabs between browsing sessions
++        Don't persist tabs between browsing sessions. Caution: parameters in urls allow linking between different sessions.
 +      </message>
        <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
          LINK

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

@@ -6,9 +6,10 @@ And allow use about:blank as default homepage
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../tab_management/TabGridDialogMediator.java    |  9 ++++++++-
+ .../tab_management/TabGridDialogMediator.java    | 11 ++++++++++-
  .../tasks/tab_management/TabGroupUiMediator.java |  8 +++++++-
  .../java/res/xml/homepage_preferences.xml        |  5 +++++
+ .../strip/TabGroupContextMenuCoordinator.java    | 11 ++++++++++-
  .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++
  .../homepage/settings/HomepageSettings.java      | 12 ++++++++++++
  .../chrome/browser/metrics/LaunchMetrics.java    |  1 -
@@ -18,60 +19,53 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/strings/android_chrome_strings.grd   |  3 +++
  chrome/browser/ui/browser_ui_prefs.cc            |  2 ++
  chrome/common/pref_names.h                       |  4 ++++
- 12 files changed, 67 insertions(+), 3 deletions(-)
+ 13 files changed, 79 insertions(+), 4 deletions(-)
 
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -26,6 +26,7 @@ import org.chromium.base.task.TaskTraits;
+@@ -94,6 +94,9 @@ import java.util.Map;
- import org.chromium.chrome.browser.data_sharing.DataSharingNotificationManager;
+ import java.util.Objects;
- import org.chromium.chrome.browser.data_sharing.SharedImageTilesCoordinator;
+ import java.util.Optional;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ 
 +import org.chromium.chrome.browser.homepage.HomepageManager;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabCreationState;
- import org.chromium.chrome.browser.tab.TabLaunchType;
-@@ -58,6 +59,7 @@ import org.chromium.ui.KeyboardVisibilityDelegate;
- import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.modelutil.PropertyModel;
- import org.chromium.ui.text.EmptyTextWatcher;
 +import org.chromium.url.GURL;
- 
++
- import java.util.ArrayList;
+ /**
- import java.util.List;
+  * A mediator for the TabGridDialog component, responsible for communicating with the components'
-@@ -697,11 +699,16 @@ public class TabGridDialogMediator
+  * coordinator as well as managing the business logic for dialog show/hide.
- 
+@@ -914,9 +917,15 @@ public class TabGridDialogMediator
-             assert relatedTabs.size() > 0;
+                 return;
+             }
  
 +            String url = UrlConstants.NTP_URL;
-+            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
++            if (UrlConstants.NTP_URL.equals(url)
++                    && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
 +                url = gurl != null ? gurl.getSpec() : url;
 +            }
-             Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
+             TabGroupUtils.openUrlInGroup(
-             mTabCreatorManager
+                     mCurrentTabGroupModelFilterSupplier.get(),
-                     .getTabCreator(currentTab.isIncognito())
+-                    UrlConstants.NTP_URL,
-                     .createNewTab(
++                    url,
--                            new LoadUrlParams(UrlConstants.NTP_URL),
+                     currentTab.getId(),
-+                            new LoadUrlParams(url),
+                     TabLaunchType.FROM_TAB_GROUP_UI);
-                             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;
+@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory;
- import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
- import org.chromium.base.supplier.ObservableSupplierImpl;
+ import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
- import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
  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 {
+@@ -367,10 +368,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver,
                      assert relatedTabs.size() > 0;
  
-                     parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
+                     Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
 +                    String url = UrlConstants.NTP_URL;
 +                    if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                        GURL gurl = HomepageManager.getInstance().getHomepageGurl();
@@ -100,10 +94,40 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
      <org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
          android:key="homepage_radio_group"
          android:selectable="false"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
+@@ -63,6 +63,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
+ import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation;
+ import org.chromium.ui.widget.RectProvider;
+ 
++import org.chromium.chrome.browser.homepage.HomepageManager;
++import org.chromium.url.GURL;
++
+ /**
+  * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
+  * responsible for creating a list of menu items, setting up the menu and displaying the menu.
+@@ -191,9 +194,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+                         /* didCloseCallback= */ null);
+                 recordUserAction("DeleteGroup");
+             } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) {
++                String url = UrlConstants.NTP_URL;
++                if (UrlConstants.NTP_URL.equals(url)
++                        && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
++                    GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++                    url = gurl != null ? gurl.getSpec() : url;
++                }
+                 TabGroupUtils.openUrlInGroup(
+                         tabGroupModelFilter,
+-                        UrlConstants.NTP_URL,
++                        url,
+                         tabId,
+                         TabLaunchType.FROM_TAB_GROUP_UI);
+                 recordUserAction("NewTabInGroup");
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -233,6 +233,22 @@ public class HomepageManager
+@@ -237,6 +237,22 @@ public class HomepageManager
          notifyHomepageUpdated();
      }
  
@@ -129,7 +153,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -22,6 +22,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -24,6 +24,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  import org.chromium.components.embedder_support.util.UrlUtilities;
  import org.chromium.components.url_formatter.UrlFormatter;
  import org.chromium.url.GURL;
@@ -137,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
  
  /** Fragment that allows the user to configure homepage related preferences. */
  public class HomepageSettings extends ChromeBaseSettingsFragment {
-@@ -30,6 +31,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -32,6 +33,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
      @VisibleForTesting
      public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
  
@@ -145,8 +169,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 +
      private HomepageManager mHomepageManager;
      private RadioButtonGroupHomepagePreference mRadioButtons;
- 
+     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-@@ -64,6 +67,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -67,6 +70,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
                  });
          mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
  
@@ -165,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
-@@ -111,7 +111,6 @@ public class LaunchMetrics {
+@@ -113,7 +113,6 @@ public class LaunchMetrics {
      public static void recordHomePageLaunchMetrics(
              boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
          if (homepageGurl.isEmpty()) {
@@ -181,9 +205,9 @@ 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;
+ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
+ import org.chromium.chrome.browser.profiles.Profile;
 @@ -485,6 +486,13 @@ public class ChromeTabCreator extends TabCreator {
       * @return the created tab.
       */
@@ -201,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -277,6 +277,7 @@ public final class ChromePreferenceKeys {
+@@ -287,6 +287,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP";
      public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
  
@@ -212,7 +236,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -62,6 +62,7 @@ public class LegacyChromePreferenceKeys {
+@@ -59,6 +59,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
                  ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -223,7 +247,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1377,6 +1377,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1528,6 +1528,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,7 +260,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -85,6 +85,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -91,6 +91,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kShowForwardButton, true,
        GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags());
@@ -248,7 +272,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1280,6 +1280,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
+@@ -1342,6 +1342,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
  // toolbar.
  inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
  
@@ -256,7 +280,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 +// instead of the New Tab page.
 +inline constexpr char kNewTabPageIsHomePage[] = "newtabpage_is_homepage";
 +
- // Boolean pref to define the default setting for "block offensive words".
+ // Comma separated list of domain names (e.g. "google.com,school.edu").
- // The old key value is kept to avoid unnecessary migration code.
+ // When this pref is set, the user will be able to access Google Apps
- inline constexpr char kSpeechRecognitionFilterProfanities[] =
+ // only using an account that belongs to one of the domains from this pref.
 --

build/patches/Add-search-engine.patch

@@ -11,9 +11,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../search_engine_choice/default_favicon.png  | Bin 0 -> 903 bytes
  ...search_engine_choice_scaled_resources.grdp |   1 +
  .../search_engines/prepopulated_engines.json  |  31 ++++++++++++++++++
+ .../search_engine_choice_utils.cc             |   5 +--
  .../search_engine_countries-inc.cc            |   3 ++
  .../search_engines/search_engine_type.h       |   5 +++
- 5 files changed, 40 insertions(+)
+ .../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
@@ -57,8 +60,8 @@ diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/c
 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 @@
+@@ -130,6 +130,16 @@
-       "id": 92
+       ]
      },
  
 +    "duckduckgo_light": {
@@ -74,7 +77,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
      "ecosia": {
        "name": "Ecosia",
        "keyword": "ecosia.org",
-@@ -174,6 +184,27 @@
+@@ -205,6 +215,27 @@
        "id": 111
      },
  
@@ -102,10 +105,25 @@ 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
+@@ -186,10 +186,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+ }
+ 
+ void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
+-  base::UmaHistogramExactLinear(
+-      kSearchEngineChoiceScreenSelectedEngineIndexHistogram,
+-      selected_engine_index,
+-      TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
++  // do nothing in Cromite
+ }
+ 
+ void RecordChoiceScreenPositionsCountryMismatch(bool has_mismatch) {
 diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
 --- a/components/search_engines/search_engine_countries-inc.cc
 +++ b/components/search_engines/search_engine_countries-inc.cc
-@@ -33,6 +33,7 @@ struct EngineAndTier {
+@@ -38,6 +38,7 @@ struct EngineAndTier {
  
  // Default (for countries with no better engine set)
  constexpr EngineAndTier engines_default[] = {
@@ -113,7 +131,7 @@ diff --git a/components/search_engines/search_engine_countries-inc.cc b/componen
      {SearchEngineTier::kTopEngines, &google},
      {SearchEngineTier::kTopEngines, &bing},
      {SearchEngineTier::kTopEngines, &yahoo},
-@@ -1449,5 +1450,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
+@@ -1452,5 +1453,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
    for (size_t i = 0; i < num_engines; i++) {
      t_url.push_back(engines[i]);
    }
@@ -126,7 +144,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 +++ b/components/search_engines/search_engine_type.h
 @@ -91,10 +91,15 @@ enum SearchEngineType {
    SEARCH_ENGINE_YOU = 72,
-   SEARCH_ENGINE_STARTER_PACK_ASK_GOOGLE = 73,
+   SEARCH_ENGINE_STARTER_PACK_GEMINI = 73,
    SEARCH_ENGINE_LILO = 74,
 +  SEARCH_ENGINE_GOOGLE_EN = 75,
 +  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
@@ -140,4 +158,32 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
  // Enum to record the type of search engine a user used in keyword mode. This
  // should be kept aligned with the `OmniboxBuiltinEngineType` enum in enums.xml.
  // Entries should not be renumbered and numeric values should never be reused.
+diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
+--- a/components/search_engines/template_url_prepopulate_data.cc
++++ b/components/search_engines/template_url_prepopulate_data.cc
+@@ -78,7 +78,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
+   generator.seed(profile_seed);
+   std::shuffle(t_urls.begin(), t_urls.end(), generator);
+ 
+-  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
+@@ -32,13 +32,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

@@ -6,13 +6,14 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/android/chrome_java_sources.gni        |  1 +
  .../chrome/browser/ChromeTabbedActivity.java  |  7 +-
- .../ClearBrowsingDataFragment.java            |  6 ++
+ .../ClearBrowsingDataFragment.java            | 12 +++
  .../ClearBrowsingDataFragmentAtStart.java     | 74 +++++++++++++++++++
  .../ClearBrowsingDataTabsFragment.java        |  7 +-
+ .../privacy/settings/PrivacySettings.java     |  2 +-
  chrome/app/settings_strings.grdp              | 10 +++
  .../browsing_data/browsing_data_bridge.cc     |  2 +-
  .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
- .../chrome_browsing_data_remover_delegate.cc  | 13 ++++
+ .../chrome_browsing_data_remover_delegate.cc  | 15 ++++
  .../api/settings_private/prefs_util.cc        | 17 +++++
  .../browser/profiles/ProfileManagerUtils.java |  5 ++
  .../profiles/android/profile_manager_utils.cc |  5 ++
@@ -20,8 +21,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  chrome/browser/profiles/profile_manager.h     |  2 +
  .../clear_browsing_data_dialog.html           | 44 +++++++++++
  .../clear_browsing_data_dialog.ts             |  2 +
- .../strings/android_chrome_strings.grd        |  3 +
+ .../strings/android_chrome_strings.grd        |  5 +-
  .../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 | 31 ++++++++
@@ -29,14 +31,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  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/dips/dips_service_impl.cc     |  2 +-
  content/browser/storage_partition_impl.cc     |  1 +
- 26 files changed, 312 insertions(+), 17 deletions(-)
+ .../public/browser/browsing_data_remover.h    |  7 +-
+ 30 files changed, 336 insertions(+), 23 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -308,6 +308,7 @@ chrome_java_sources = [
+@@ -316,6 +316,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",
@@ -47,20 +51,20 @@ 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
-@@ -172,6 +172,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
 +import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
  import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
+ import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
  import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
- import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification;
+@@ -1652,7 +1653,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
-@@ -1614,7 +1615,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              Intent intent = getIntent();
  
              boolean hadCipherData =
--                    CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
+-                    CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
-+                    CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState()); //
++                    CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState()); //
 +            if (!hadCipherData) {
 +                Log.i(TAG, "Removing browsing data");
 +                ProfileManagerUtils.removeBrowsingDataAtStart();
@@ -71,7 +75,20 @@ 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
-@@ -448,6 +448,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -163,6 +163,12 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
+ 
+             mParent.updateButtonState();
+             mShouldAnnounceCounterResult = true;
++
++            BrowsingDataBridge.getForProfile(mParent.getProfile())
++                    .setBrowsingDataDeletionPreference(
++                            ClearBrowsingDataFragment.getDataType(mOption),
++                            mParent.getClearBrowsingDataTabType(),
++                            mCheckbox.isChecked());
+             return true;
+         }
+ 
+@@ -475,6 +481,10 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
      /** Returns whether is a basic or advanced Clear Browsing Data tab. */
      protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
  
@@ -82,7 +99,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.
       *
-@@ -528,6 +532,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -555,6 +565,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
       * options.
       */
      private void onClearButtonClicked() {
@@ -90,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -560,6 +565,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -585,6 +596,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
          Button clearButton = (Button) getView().findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
@@ -162,7 +179,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);
@@ -180,16 +197,16 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-@@ -29,7 +29,7 @@ import org.chromium.chrome.browser.settings.SettingsActivity;
+@@ -32,7 +32,7 @@ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
-  * Fragment with a {@link TabLayout} containing a basic and an advanced version of the CBD dialog.
   */
- public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDependentSetting {
+ public class ClearBrowsingDataTabsFragment extends Fragment
+         implements ProfileDependentSetting, EmbeddableSettingsPage {
 -    public static final int CBD_TAB_COUNT = 2;
 +    public static final int CBD_TAB_COUNT = 3;
  
      private Profile mProfile;
      private ClearBrowsingDataFetcher mFetcher;
-@@ -93,6 +93,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -115,6 +115,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment
                  return getActivity().getString(R.string.clear_browsing_data_basic_tab_title);
              case 1:
                  return getActivity().getString(R.string.prefs_section_advanced);
@@ -198,7 +215,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
+@@ -166,6 +168,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment
                  case 1:
                      fragment = new ClearBrowsingDataFragmentAdvanced();
                      break;
@@ -208,12 +225,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
                  default:
                      throw new RuntimeException("invalid position: " + position);
              }
+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
+@@ -336,7 +336,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                             thirdPartyCookies.getTitle().toString());
+         }
+ 
+-        if (QuickDeleteController.isQuickDeleteFollowupEnabled()) {
++        if (((false)) && QuickDeleteController.isQuickDeleteFollowupEnabled()) {
+             Preference clearBrowsingDataPreference = findPreference(PREF_CLEAR_BROWSING_DATA);
+             Preference clearBrowsingDataAdvancedPreference =
+                     findPreference(PREF_CLEAR_BROWSING_DATA_ADVANCED);
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2294,6 +2294,16 @@
+@@ -2220,6 +2220,16 @@
-   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for clear browsing data button in Privacy options">
+   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
-     Clear browsing data
+     Delete browsing data
    </message>
 +  <if expr="is_win or is_linux">
 +    <message name="IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE" desc="The title of the tab showing the at start clear browsing data options.">
@@ -225,25 +254,25 @@ 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.">
+   <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.">
-     Clear history, cookies, cache, and more
+     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
-@@ -339,7 +339,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(
+@@ -304,7 +304,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(JNIEnv* env,
-     const JavaParamRef<jobject>& jprofile,
+                                                                Profile* profile,
-     jint tab_index) {
+                                                                jint tab_index) {
    DCHECK_GE(tab_index, 0);
 -  DCHECK_LT(tab_index, 2);
 +  DCHECK_LT(tab_index, 3);
-   GetPrefService(jprofile)->SetInteger(
+   GetPrefService(profile)->SetInteger(
        browsing_data::prefs::kLastClearBrowsingDataTab, tab_index);
  }
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -312,8 +312,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -311,8 +311,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
  
  void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
      bool keep_browser_alive) {
@@ -271,7 +300,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
  
    if (!data_types.empty() &&
        IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -422,6 +439,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -421,6 +438,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
  bool ChromeBrowsingDataLifetimeManager::
      IsConditionSatisfiedForBrowsingDataRemoval(
          const syncer::UserSelectableTypeSet sync_types) {
@@ -282,7 +311,15 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -440,6 +440,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -355,6 +355,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+     uint64_t origin_type_mask,
+     base::OnceCallback<void(uint64_t)> callback) {
+   CHECK(((remove_mask &
++          ~content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE &
+           ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
+           ~constants::FILTERABLE_DATA_TYPES) == 0) ||
+         filter_builder->MatchesAllOriginsAndDomains());
+@@ -462,6 +463,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -292,27 +329,19 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -490,7 +493,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -570,6 +574,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
-           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_CONTENTS |
+     // and SSL host state are scoped to hosts and represent them as std::string.
-           prerender::NoStatePrefetchManager::CLEAR_PRERENDER_HISTORY);
+     // Rename the method to indicate its more general usage.
-     }
+     if (profile_->GetSSLHostStateDelegate()) {
-+  }
++      bool skip = false;
- 
++      if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE) {
-+  if ((remove_mask & constants::DATA_TYPE_HISTORY) && may_delete_history) {
++        skip = true;
-     // 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
++      if (!skip)
-     // history, so clear them as well.
+       profile_->GetSSLHostStateDelegate()->Clear(
-@@ -511,7 +516,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+           filter_builder->MatchesAllOriginsAndDomains()
-       if (data_manager)
+               ? base::RepeatingCallback<bool(const std::string&)>()
-         data_manager->Refresh();
+@@ -598,9 +607,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
-     }
-+  }
- 
-+  if (remove_mask & content::BrowsingDataRemover::DATA_TYPE_CACHE) {
-     base::ThreadPool::PostTaskAndReply(
-         FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
-         base::BindOnce(
-@@ -586,9 +593,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -326,7 +355,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
-@@ -1245,6 +1256,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1281,6 +1294,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -338,7 +367,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -520,6 +520,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -535,6 +535,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -384,7 +413,7 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc
 --- a/chrome/browser/profiles/android/profile_manager_utils.cc
 +++ b/chrome/browser/profiles/android/profile_manager_utils.cc
-@@ -62,3 +62,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
+@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
        g_browser_process->profile_manager()->GetLoadedProfiles(),
        RemoveSessionCookiesForProfile);
  }
@@ -396,7 +425,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
-@@ -1481,6 +1481,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1427,6 +1427,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
    }
  }
  
@@ -416,7 +445,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  void ProfileManager::DoFinalInitForServices(Profile* profile,
                                              bool go_off_the_record) {
    if (!do_final_services_init_ ||
-@@ -2141,7 +2154,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2109,7 +2122,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
    Profile* original_profile = profile->GetOriginalProfile();
    // Do nothing if the closed window is not the last window of the same profile.
    for (Browser* browser_iter : *BrowserList::GetInstance()) {
@@ -428,7 +457,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -199,6 +199,8 @@ class ProfileManager : public Profile::Delegate {
+@@ -195,6 +195,8 @@ class ProfileManager : public Profile::Delegate {
    //   profiles.
    std::vector<Profile*> GetLoadedProfiles() const;
  
@@ -440,7 +469,7 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
-@@ -317,6 +317,50 @@
+@@ -297,6 +297,50 @@
                  disabled="[[clearingInProgress_]]" no-set-pref>
              </settings-checkbox>
            </div>
@@ -488,13 +517,13 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 +                sub-label="[[counters_.hosted_apps_data]]">
 +            </settings-checkbox>
 +          </div>
-         </iron-pages>
+         </cr-page-selector>
        </div>
        <div slot="button-container">
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -304,6 +304,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -239,6 +239,7 @@ export class SettingsClearBrowsingDataDialogElement extends
          value: () =>
              [loadTimeData.getString('basicPageTitle'),
               loadTimeData.getString('advancedPageTitle'),
@@ -502,7 +531,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
      ],
        },
  
-@@ -427,6 +428,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -363,6 +364,7 @@ export class SettingsClearBrowsingDataDialogElement extends
      }
      this.clearButtonDisabled_ =
          this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -513,9 +542,18 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1481,6 +1481,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1462,7 +1462,7 @@ For example, some websites may respond to this request by showing you ads that a
+         Delete browsing data
+       </message>
+       <message name="IDS_CLEAR_BROWSING_DATA_SUMMARY" desc="Summary of the settings item that opens the Delete Browsing Data dialog.">
+-        Delete history, cookies, site data, cache…
++        Delete immediately or choose when to delete browsing data
+       </message>
+       <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_DIALOG_TITLE" desc="Title of a dialog that is shown after the deletion of browsing history finished.">
+         Deleted Chrome data
+@@ -1623,6 +1623,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
-         Some of your web history might not show up here. If needed, tap Open full Chrome history. Also, Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
+         Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
        </message>
 +      <message name="IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE" desc="The title of the tab showing the at start clear browsing data options.">
 +        At Startup
@@ -526,7 +564,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
-@@ -1689,6 +1689,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1895,6 +1895,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -534,10 +572,29 @@ 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
+@@ -39,8 +39,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
-@@ -16,21 +16,21 @@
+@@ -17,21 +17,21 @@
  
  namespace browsing_data {
  
@@ -593,7 +650,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -318,6 +318,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -346,6 +346,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -646,7 +703,7 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
 diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
 --- a/components/browsing_data/core/pref_names.cc
 +++ b/components/browsing_data/core/pref_names.cc
-@@ -29,6 +29,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -63,6 +63,23 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(
        kClearBrowsingDataHistoryNoticeShownTimes, 0);
  
@@ -673,7 +730,7 @@ diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_d
 diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_data/core/pref_names.h
 --- a/components/browsing_data/core/pref_names.h
 +++ b/components/browsing_data/core/pref_names.h
-@@ -28,6 +28,16 @@ inline constexpr char kClearBrowsingDataOnExitDeletionPending[] =
+@@ -32,6 +32,16 @@ inline constexpr char kClearBrowsingDataOnExitDeletionPending[] =
  inline constexpr char kClearBrowsingDataOnExitList[] =
      "browser.clear_data.clear_on_exit";
  
@@ -693,7 +750,7 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -764,6 +764,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -778,6 +778,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
      if (turl->date_created() >= created_after &&
          (created_before.is_null() || turl->date_created() < created_before) &&
          turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -701,10 +758,22 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
          turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
          (url_filter.is_null() ||
           url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
+diff --git a/content/browser/dips/dips_service_impl.cc b/content/browser/dips/dips_service_impl.cc
+--- a/content/browser/dips/dips_service_impl.cc
++++ b/content/browser/dips/dips_service_impl.cc
+@@ -198,7 +198,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
+     remove_mask &= ~content::BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
+     remover->RemoveWithFilterAndReply(
+         base::Time::Min(), base::Time::Max(),
+-        remove_mask |
++        remove_mask | content::BrowsingDataRemover::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/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1497,6 +1497,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1529,6 +1529,7 @@ void StoragePartitionImpl::Initialize(
                              .AppendASCII("Code Cache");
      }
      DCHECK_GE(settings.size_in_bytes(), 0);
@@ -712,4 +781,28 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
      GetGeneratedCodeCacheContext()->Initialize(code_cache_path,
                                                 settings.size_in_bytes());
    }
+diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h
+--- a/content/public/browser/browsing_data_remover.h
++++ b/content/public/browser/browsing_data_remover.h
+@@ -151,14 +151,19 @@ class BrowsingDataRemover {
+   static constexpr DataType DATA_TYPE_RELATED_WEBSITE_SETS_PERMISSIONS = 1
+                                                                          << 24;
+ 
++  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 25;
++
+   // Device bound sessions
+   // (https://github.com/WICG/dbsc/blob/main/README.md)
+-  static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 25;
++  static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 26;
+ 
+   // Embedders can add more datatypes beyond this point.
+   static constexpr DataType DATA_TYPE_CONTENT_END =
+       DATA_TYPE_DEVICE_BOUND_SESSIONS;
+ 
++  static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_DEVICE_BOUND_SESSIONS,
++              "Please check.");
++
+   // All data stored by the Attribution Reporting API.
+   static constexpr DataType DATA_TYPE_ATTRIBUTION_REPORTING =
+       DATA_TYPE_ATTRIBUTION_REPORTING_SITE_CREATED |
 --

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

@@ -8,18 +8,19 @@ The feature can be activated from the accessibility settings.
 Need: bromite-build-utils.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../AwContextMenuItemDelegate.java            |  4 +++
  chrome/android/java/res/values/ids.xml        |  1 +
- .../settings/AccessibilitySettings.java       | 12 +++++++
  .../ChromeAccessibilitySettingsDelegate.java  | 18 ++++++++++
  .../contextmenu/ChromeContextMenuItem.java    |  5 ++-
  .../ChromeContextMenuPopulator.java           |  5 +++
  .../tab/TabContextMenuItemDelegate.java       |  8 +++++
- .../contextmenu/ContextMenuItemDelegate.java  |  2 ++
  .../flags/android/chrome_feature_list.cc      |  1 +
  .../browser/flags/ChromeFeatureList.java      |  5 +++
  .../strings/android_chrome_strings.grd        |  9 +++++
  .../res/xml/accessibility_preferences.xml     |  5 +++
+ .../accessibility/AccessibilitySettings.java  | 12 +++++++
  .../AccessibilitySettingsDelegate.java        |  2 ++
+ .../contextmenu/ContextMenuItemDelegate.java  |  3 ++
  ...Add-setting-to-invert-tap-and-long-tap.inc |  8 +++++
  ...Add-setting-to-invert-tap-and-long-tap.inc |  3 ++
  ...Add-setting-to-invert-tap-and-long-tap.inc |  1 +
@@ -29,15 +30,36 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../renderer/core/html/html_image_element.h   |  2 ++
  .../core/page/context_menu_controller.cc      | 33 ++++++++++++-----
  .../core/page/context_menu_controller.h       |  5 +--
- 21 files changed, 165 insertions(+), 20 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;
+@@ -52,6 +53,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
+         IntentUtils.safeStartActivity(mActivity, intent);
+     }
+ 
++    @Override
++    public void onOpenUrl(GURL url, Referrer referrer) { }
++
+     @Override
+     public GURL getPageUrl() {
+         return mWebContents.getVisibleUrl();
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -91,6 +91,7 @@ found in the LICENSE file.
+@@ -88,6 +88,7 @@ found in the LICENSE file.
  
      <!-- Menu item IDs for FullscreenActivities -->
      <item type="id" name="contextmenu_open_in_chrome" />
@@ -45,57 +67,21 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
  
      <!-- Tags -->
      <item type="id" name="highlight_color" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -55,6 +55,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
-     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
- 
-+    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
-+    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
-+
-     private TextScalePreference mTextScalePref;
-     private PageZoomPreference mPageZoomDefaultZoomPref;
-     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -174,6 +177,12 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled());
-         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
- 
-+        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
-+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
-+        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
-+        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.isEnabled());
-+        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
-+
-         Preference captions = findPreference(PREF_CAPTIONS);
-         captions.setOnPreferenceClickListener(
-                 preference -> {
-@@ -262,6 +271,9 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
-             mDelegate.requestRestart(getActivity());
-         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
-             mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue);
-+        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
-+            mShowAlwaysContextMenuOnLinksDelegate.setEnabled((Boolean) newValue);
-+            mDelegate.requestRestart(getActivity());
-         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
-             // TODO(mschillaci): Implement the override behavior for OS level.
-         }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -136,6 +136,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -162,6 +162,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
-             mSnackbarManager.showSnackbar(mSnackbar);
+             mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
      }
  
 +    private static class ShowAlwaysContextMenuOnLinksDelegate implements BooleanPreferenceDelegate {
 +        @Override
-+        public boolean isEnabled() {
++        public boolean getValue() {
 +            return ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled();
 +        }
 +
 +        @Override
-+        public void setEnabled(boolean value) {
++        public void setValue(boolean value) {
 +            CromiteNativeUtils.setFlagEnabled(ChromeFeatureList.SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS,
 +                    "show-always-context-menu-on-links", value);
 +        }
@@ -142,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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 {
+@@ -337,6 +337,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
  
          if (mParams.isAnchor()) {
              ModelList linkGroup = new ModelList();
@@ -152,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
              if (FirstRunStatus.getFirstRunFlowComplete()
                      && !isEmptyUrl(mParams.getUrl())
                      && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -631,6 +634,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -725,6 +728,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -164,7 +150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -273,6 +273,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -301,6 +301,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
          mTab.loadUrl(loadUrlParams);
      }
  
@@ -175,37 +161,25 @@ 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.
+      * Called when the {@code url} is of an image and should be opened in a new page.
-      * @param url The image URL to open.
+      *
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -287,6 +287,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -340,6 +340,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kTabIdMapAndroid,
+     &kTabDragDropAndroid,
-     &kTabletTabSwitcherLongPressMenu,
+     &kToolbarPhoneCleanup,
-     &kTabletToolbarIncognitoStatus,
+     &kTabGroupCreationDialogAndroid,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
-     &kTabletToolbarReordering,
      &kTabResumptionModuleAndroid,
      &kTabStateFlatBuffer,
+     &kTabStripGroupCollapseAndroid,
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -348,6 +348,8 @@ public abstract class ChromeFeatureList {
+@@ -407,6 +407,8 @@ public abstract class ChromeFeatureList {
              "DisableToolbarSwipeUp";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -214,27 +188,27 @@ 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";
-@@ -630,6 +632,8 @@ public abstract class ChromeFeatureList {
+@@ -761,6 +763,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 =
+     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
-             newCachedFlag(OMNIBOX_MODERNIZE_VISUAL_UPDATE, true);
+     public static final CachedFlag sPostGetMyMemoryStateToBackground =
-     public static final CachedFlag sOptimizationGuidePushNotifications =
+             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, false);
-@@ -786,6 +790,7 @@ public abstract class ChromeFeatureList {
+@@ -941,6 +945,7 @@ public abstract class ChromeFeatureList {
-                     sTabWindowManagerIndexReassignmentActivityNotInAppTasks,
                      sTabWindowManagerReportIndicesMismatch,
+                     sTraceBinderIpc,
                      sUseChimeAndroidSdk,
 +                    sShowAlwaysContextMenuOnLinks,
                      sUseLibunwindstackNativeUnwinderAndroid,
-                     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
-@@ -1692,6 +1692,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1775,6 +1775,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
          Disable toolbar swipe up
        </message>
@@ -247,7 +221,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Safety check -->
        <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
-@@ -2871,6 +2877,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>clear the Chrome da
+@@ -3314,6 +3320,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
          Open in new Chrome tab
        </message>
@@ -260,7 +234,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -35,6 +35,11 @@ found in the LICENSE file.
+@@ -31,6 +31,11 @@ found in the LICENSE file.
          android:summary="@string/page_zoom_always_show_preference_summary"
          android:title="@string/page_zoom_always_show_preference_title" />
  
@@ -272,18 +246,74 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
      <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
          android:key="force_enable_zoom"
          android:summary="@string/force_enable_zoom_summary"
+diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
++++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+@@ -48,6 +48,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
+     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
+ 
++    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
++    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
++
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -136,6 +139,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
+         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
+ 
++        ChromeSwitchPreference mShowAlwaysContextMenuOnLinksPref =
++                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS);
++        mShowAlwaysContextMenuOnLinksDelegate = mDelegate.getShowAlwaysContextMenuOnLinksDelegate();
++        mShowAlwaysContextMenuOnLinksPref.setChecked(mShowAlwaysContextMenuOnLinksDelegate.getValue());
++        mShowAlwaysContextMenuOnLinksPref.setOnPreferenceChangeListener(this);
++
+         Preference captions = findPreference(PREF_CAPTIONS);
+         captions.setOnPreferenceClickListener(
+                 preference -> {
+@@ -213,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+             mDelegate.requestRestart(getActivity());
+         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
+             mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
++        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
++            mShowAlwaysContextMenuOnLinksDelegate.setValue((Boolean) newValue);
++            mDelegate.requestRestart(getActivity());
+         } else if (PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT.equals(preference.getKey())) {
+             // TODO(mschillaci): Implement the override behavior for OS level.
+         } else if (OmniboxFeatures.KEY_JUMP_START_OMNIBOX.equals(preference.getKey())) {
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate {
+@@ -42,6 +42,8 @@ public interface AccessibilitySettingsDelegate {
      BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate();
      BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate();
  
 +    BooleanPreferenceDelegate getShowAlwaysContextMenuOnLinksDelegate();
 +
-     /** @return The BrowserContextHandle that should be used to read and update settings. */
+     /**
-     BrowserContextHandle getBrowserContextHandle();
+      * @return The BrowserContextHandle that should be used to read and update settings.
+      */
+diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
+--- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
++++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
+@@ -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
@@ -314,7 +344,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
 --- a/third_party/blink/renderer/core/html/html_anchor_element.cc
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
-@@ -63,6 +63,7 @@
+@@ -62,6 +62,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"
@@ -322,16 +352,16 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
  #include "third_party/blink/renderer/core/page/page.h"
  #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
  #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -518,6 +519,17 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+@@ -502,6 +503,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
-                                             bool is_trusted,
+     bool is_trusted,
-                                             base::TimeTicks platform_time_stamp,
+     base::TimeTicks platform_time_stamp,
-                                             KURL completed_url) {
+     KURL completed_url) {
 +  UIEvent& event = *UIEvent::Create();
 +  NavigateToHyperlink2(std::move(request), navigation_policy, is_trusted, platform_time_stamp,
 +    std::move(completed_url), event, true);
 +}
 +
-+void HTMLAnchorElement::NavigateToHyperlink2(ResourceRequest request,
++void HTMLAnchorElementBase::NavigateToHyperlink2(ResourceRequest request,
 +                                            NavigationPolicy navigation_policy,
 +                                            bool is_trusted,
 +                                            base::TimeTicks platform_time_stamp,
@@ -340,8 +370,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    LocalDOMWindow* window = GetDocument().domWindow();
    if (!window) {
      return;
-@@ -578,6 +590,15 @@ void HTMLAnchorElement::NavigateToHyperlink(ResourceRequest request,
+@@ -582,6 +594,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
-             /*element=*/this, request.HasUserGesture()));
+             request.GetReferrerPolicy()));
    }
  
 +  if (!do_not_show_context_menu &&
@@ -356,39 +386,39 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    Frame* target_frame =
        frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
  
-@@ -631,7 +652,7 @@ AtomicString HTMLAnchorElement::interestAction() const {
+@@ -636,7 +657,7 @@ AtomicString HTMLAnchorElementBase::interestAction() const {
    return g_empty_atom;
  }
  
--void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+-void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
-+void HTMLAnchorElement::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
++void HTMLAnchorElementBase::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
    event.SetDefaultHandled();
  
    LocalDOMWindow* window = GetDocument().domWindow();
-@@ -727,13 +748,12 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -732,13 +753,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      return;
    }
  
 -  base::OnceClosure navigate_closure = WTF::BindOnce(
--      &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this),
+-      &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 -      std::move(request), navigation_policy, event.isTrusted(),
 -      event.PlatformTimeStamp(), std::move(completed_url));
 -
    if (navigation_policy == kNavigationPolicyDownload ||
        navigation_policy == kNavigationPolicyLinkPreview) {
 +    base::OnceClosure navigate_closure = WTF::BindOnce(
-+        &HTMLAnchorElement::NavigateToHyperlink, WrapWeakPersistent(this),
++        &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 +        std::move(request), navigation_policy, event.isTrusted(),
 +        event.PlatformTimeStamp(), std::move(completed_url));
      // We distinguish single/double click with some modifiers.
      // See the comment of `EventHandler.delayed_navigation_task_handle_`.
      auto task_handle = PostDelayedCancellableTask(
-@@ -743,7 +763,9 @@ void HTMLAnchorElement::HandleClick(MouseEvent& event) {
+@@ -748,7 +768,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      frame->GetEventHandler().SetDelayedNavigationTaskHandle(
          std::move(task_handle));
    } else {
 -    std::move(navigate_closure).Run();
-+    HTMLAnchorElement::NavigateToHyperlink2(std::move(request), navigation_policy,
++    HTMLAnchorElementBase::NavigateToHyperlink2(std::move(request), navigation_policy,
 +      event.isTrusted(), event.PlatformTimeStamp(), std::move(completed_url),
 +      event, do_not_show_context_menu);
    }
@@ -397,15 +427,15 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
-@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+@@ -117,6 +117,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
    AtomicString interestAction() const override;
  
    void Trace(Visitor*) const override;
 +  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
  
   protected:
-   void ParseAttribute(const AttributeModificationParams&) override;
+   HTMLAnchorElementBase(const QualifiedName& tag_name, Document&);
-@@ -143,7 +144,11 @@ class CORE_EXPORT HTMLAnchorElement : public HTMLElement, public DOMURLUtils {
+@@ -148,7 +149,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
                             bool is_trusted,
                             base::TimeTicks platform_time_stamp,
                             KURL);
@@ -421,7 +451,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
 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"
@@ -429,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"
@@ -437,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
  #include "third_party/blink/renderer/core/probe/core_probes.h"
  #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
-@@ -799,6 +801,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -797,6 +799,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
    }
  }
  
@@ -462,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -236,6 +236,8 @@ class CORE_EXPORT HTMLImageElement final
+@@ -218,6 +218,8 @@ class CORE_EXPORT HTMLImageElement
    void DidAddUserAgentShadowRoot(ShadowRoot&) override;
    void AdjustStyle(ComputedStyleBuilder&) override;
  
@@ -474,7 +504,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc
 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -228,14 +228,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -196,14 +196,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
    }
  }
  
@@ -494,7 +524,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
      mouse_event->SetDefaultHandled();
  }
  
-@@ -453,7 +455,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -427,7 +429,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
  bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                              const PhysicalOffset& point,
                                              WebMenuSourceType source_type,
@@ -504,14 +534,14 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Displaying the context menu in this function is a big hack as we don't
    // have context, i.e. whether this is being invoked via a script or in
    // response to user input (Mouse event WM_RBUTTONDOWN,
-@@ -476,6 +479,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -450,6 +453,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
    if (!result.InnerNodeOrImageMapImage())
      return false;
  
 +  if (!do_not_show_context_menu &&
 +        base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
 +    if (auto* anchor_element = DynamicTo<HTMLAnchorElement>(result.URLElement())) {
-+      MouseEvent event;
++      MouseEvent& event = *MouseEvent::Create();
 +      event.SetTarget(mouse_event->target());
 +      anchor_element->HandleClick(event, /*do_not_show_context_menu*/true);
 +      return true;
@@ -521,9 +551,9 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Clear any previously set cached results if we are resetting the hit test
    // result.
    image_selection_cached_result_ = nullptr;
-@@ -830,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -793,11 +806,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+ 
    SetAutofillData(result.InnerNode(), data);
-   SetPasswordManagerData(result.InnerElement(), data);
  
 -  const bool from_touch = source_type == kMenuSourceTouch ||
 -                          source_type == kMenuSourceLongPress ||
@@ -543,7 +573,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h
 --- a/third_party/blink/renderer/core/page/context_menu_controller.h
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.h
-@@ -57,7 +57,7 @@ class CORE_EXPORT ContextMenuController final
+@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController final
  
    void DocumentDetached(Document*);
  
@@ -552,7 +582,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th
    void ShowContextMenuAtPoint(LocalFrame*,
                                float x,
                                float y,
-@@ -123,7 +123,8 @@ class CORE_EXPORT ContextMenuController final
+@@ -125,7 +125,8 @@ class CORE_EXPORT ContextMenuController final
    bool ShowContextMenu(LocalFrame*,
                         const PhysicalOffset&,
                         WebMenuSourceType,

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

@@ -24,14 +24,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -155,6 +155,7 @@
+@@ -164,6 +164,7 @@
- #include "components/send_tab_to_self/features.h"
+ #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
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
  #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h"
  #include "components/webapps/browser/banners/app_banner_settings_helper.h"
  #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-@@ -388,6 +389,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -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;
  
-@@ -402,6 +407,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
-@@ -24,6 +24,7 @@
+@@ -23,6 +23,7 @@
+ #include "base/task/single_thread_task_runner.h"
  #include "base/time/clock.h"
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
 +#include "components/site_engagement/core/features.h"
  #include "components/feature_engagement/internal/availability_model_impl.h"
  #include "components/feature_engagement/internal/blocked_iph_features.h"
  #include "components/feature_engagement/internal/chrome_variations_configuration.h"
-@@ -212,6 +213,8 @@ TrackerImpl::TrackerImpl(
+@@ -211,6 +212,8 @@ TrackerImpl::TrackerImpl(
  TrackerImpl::~TrackerImpl() = default;
  
  void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -96,7 +96,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
  #include "components/feature_engagement/public/configuration.h"
  #include "components/feature_engagement/public/event_constants.h"
  #include "components/feature_engagement/public/feature_constants.h"
-@@ -112,6 +113,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
    }
  
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -108,11 +108,11 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 +
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_CHROMEOS)
-   if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
+   if (kIPHPasswordsManagementBubbleAfterSaveFeature.name == feature->name) {
 diff --git a/components/site_engagement/content/site_engagement_score.cc b/components/site_engagement/content/site_engagement_score.cc
 --- a/components/site_engagement/content/site_engagement_score.cc
 +++ b/components/site_engagement/content/site_engagement_score.cc
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
  #include "components/content_settings/core/common/content_settings.h"
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/content_settings/core/common/content_settings_utils.h"
@@ -120,7 +120,7 @@ diff --git a/components/site_engagement/content/site_engagement_score.cc b/compo
  #include "components/site_engagement/content/engagement_type.h"
  #include "components/site_engagement/content/site_engagement_metrics.h"
  #include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom.h"
-@@ -275,6 +276,10 @@ void SiteEngagementScore::Commit() {
+@@ -276,6 +277,10 @@ void SiteEngagementScore::Commit() {
    if (!UpdateScoreDict(*score_dict_))
      return;
  

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

@@ -12,16 +12,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -88,6 +88,7 @@ import org.chromium.components.browser_ui.settings.CustomDividerFragment;
+@@ -55,6 +55,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
- import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.settings.PaddedItemDecorationWithDivider;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
- import org.chromium.components.browser_ui.settings.SettingsLauncher;
+ import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
- import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
+ import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
- import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
+ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
  import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
-@@ -460,8 +461,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -458,8 +459,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
-             finish();
+             finishCurrentSettings(mainFragment);
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {
 -            HelpAndFeedbackLauncherImpl.getForProfile(mProfile)

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 +++++++++++++++++++
+ .../org/chromium/base/ContentUriUtils.java    | 34 +++++++++++++++++++
- 3 files changed, 47 insertions(+)
+ 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) {
+@@ -119,6 +119,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
-   return File(fd);
+                        Time::FromMillisecondsSinceUnixEpoch(last_modified));
  }
  
 +File OpenContentUriForWrite(const FilePath& content_uri) {
@@ -30,36 +30,44 @@ diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.
 +}
 +
  std::string GetContentUriMimeType(const FilePath& content_uri) {
-   JNIEnv* env = base::android::AttachCurrentThread();
+   JNIEnv* env = android::AttachCurrentThread();
-   ScopedJavaLocalRef<jstring> j_uri =
+   return Java_ContentUriUtils_getMimeType(env, content_uri.value());
 diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
 --- a/base/android/content_uri_utils.h
 +++ b/base/android/content_uri_utils.h
-@@ -18,6 +18,10 @@ namespace base {
+@@ -33,6 +33,10 @@ BASE_EXPORT std::optional<std::string> TranslateOpenFlagsToJavaMode(
  // Returns -1 if the URI is invalid.
- BASE_EXPORT File OpenContentUriForRead(const FilePath& content_uri);
+ int 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.
+ // Returns true if file exists and results are populated, else returns false.
- BASE_EXPORT bool ContentUriExists(const FilePath& content_uri);
+ bool ContentUriGetFileInfo(const FilePath& content_uri,
- 
+                            FileEnumerator::FileInfo* results);
 diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java
 --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java
 +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java
-@@ -23,6 +23,9 @@ import org.jni_zero.CalledByNative;
+@@ -12,6 +12,7 @@ import android.content.res.AssetFileDescriptor;
- import java.io.File;
+ 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;
+@@ -30,6 +31,9 @@ import org.chromium.build.annotations.Nullable;
  import java.io.IOException;
+ import java.util.List;
  
 +import android.system.Os;
 +import android.content.ContentProviderClient;
 +
  /** This class provides methods to access content URI schemes. */
- public abstract class ContentUriUtils {
+ @JNINamespace("base")
-     private static final String TAG = "ContentUriUtils";
+ @NullMarked
-@@ -87,6 +90,36 @@ public abstract class ContentUriUtils {
+@@ -64,6 +68,36 @@ public abstract class ContentUriUtils {
          return -1;
      }
  

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

@@ -24,7 +24,7 @@ Enabled by default
  net/base/mime_util_unittest.cc                |   3 +
  third_party/.gitignore                        |   1 +
  .../blink/common/loader/network_utils.cc      |  16 +-
- .../blink/common/mime_util/mime_util.cc       |   7 +
+ .../blink/common/mime_util/mime_util.cc       |   4 +
  .../common/mime_util/mime_util_unittest.cc    |   6 +
  .../devtools_protocol/browser_protocol.pdl    |   1 +
  .../inspector/inspector_emulation_agent.cc    |   7 +-
@@ -36,7 +36,7 @@ Enabled by default
  .../platform/graphics/bitmap_image_metrics.h  |   4 +-
  .../renderer/platform/image-decoders/BUILD.gn |   9 +
  .../platform/image-decoders/image_decoder.cc  |  23 +
- .../image-decoders/jxl/jxl_image_decoder.cc   | 685 ++++++++++++++++++
+ .../image-decoders/jxl/jxl_image_decoder.cc   | 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, 1997 insertions(+), 17 deletions(-)
+ 53 files changed, 1995 insertions(+), 17 deletions(-)
  create mode 100644 build/linux/unbundle/libjxl.gn
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-support-to-jxl.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-support-to-jxl.inc
@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -491,6 +491,10 @@ vars = {
+@@ -480,6 +480,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': '00fe003dac355b979f36157f9407c7c46448958e',
    # Three lines of non-changing comments so that
    # the commit queue can handle CLs rolling ffmpeg
-@@ -1102,6 +1106,9 @@ deps = {
+@@ -1833,6 +1837,9 @@ deps = {
    'src/third_party/dawn':
      Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
  
@@ -148,13 +148,13 @@ diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/rep
 --- a/build/linux/unbundle/replace_gn_files.py
 +++ b/build/linux/unbundle/replace_gn_files.py
 @@ -56,6 +56,7 @@ REPLACEMENTS = {
-   'libdrm': 'third_party/libdrm/BUILD.gn',
+     'libavif': 'third_party/libavif/BUILD.gn',
-   'libevent': 'third_party/libevent/BUILD.gn',
+     'libdrm': 'third_party/libdrm/BUILD.gn',
-   'libjpeg': 'third_party/libjpeg.gni',
+     'libjpeg': 'third_party/libjpeg.gni',
-+  'libjxl' : 'third_party/libjxl/BUILD.gn',
++    'libjxl' : 'third_party/libjxl/BUILD.gn',
-   'libpng': 'third_party/libpng/BUILD.gn',
+     'libpng': 'third_party/libpng/BUILD.gn',
-   'libsecret' : 'third_party/libsecret/BUILD.gn',
+     'libsecret': 'third_party/libsecret/BUILD.gn',
-   'libusb': 'third_party/libusb/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:
@@ -183,19 +183,19 @@ diff --git a/cc/base/devtools_instrumentation.h b/cc/base/devtools_instrumentati
 diff --git a/cc/paint/paint_image.h b/cc/paint/paint_image.h
 --- a/cc/paint/paint_image.h
 +++ b/cc/paint/paint_image.h
-@@ -40,7 +40,7 @@ class PaintImageGenerator;
+@@ -41,7 +41,7 @@ class PaintImageGenerator;
  class PaintWorkletInput;
  class TextureBacking;
  
 -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 };
+ // An encoded image may include several auxiliary images within it. This enum
- static constexpr std::array<AuxImage, 2> kAllAuxImages = {AuxImage::kDefault,
+ // 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
-@@ -84,6 +84,8 @@ class CC_EXPORT ImageDecodeCache {
+@@ -78,6 +78,8 @@ class CC_EXPORT ImageDecodeCache {
      using ScopedImageType =
          devtools_instrumentation::ScopedImageDecodeTask::ImageType;
      switch (image_type) {
@@ -316,7 +316,7 @@ diff --git a/media/BUILD.gn b/media/BUILD.gn
 diff --git a/media/media_options.gni b/media/media_options.gni
 --- a/media/media_options.gni
 +++ b/media/media_options.gni
-@@ -132,6 +132,9 @@ declare_args() {
+@@ -137,6 +137,9 @@ declare_args() {
    # `enable_libaom` should likely also be overriddent to false.
    enable_av1_decoder = enable_dav1d_decoder
  
@@ -329,7 +329,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
 +++ b/net/base/mime_util.cc
-@@ -164,6 +164,7 @@ static const MimeInfo kPrimaryMappings[] = {
+@@ -178,6 +178,7 @@ static const MimeInfo kPrimaryMappings[] = {
      {"image/avif", "avif"},
      {"image/gif", "gif"},
      {"image/jpeg", "jpeg,jpg"},
@@ -337,8 +337,8 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
      {"image/png", "png"},
      {"image/apng", "png,apng"},
      {"image/svg+xml", "svg,svgz"},
-@@ -667,6 +668,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
+@@ -682,6 +683,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
-                                                   "image/gif",
+                                                   "image/heif",
                                                    "image/ief",
                                                    "image/jpeg",
 +                                                  "image/jxl",
@@ -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,10 +375,10 @@ 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
-@@ -91,6 +91,7 @@
+@@ -80,6 +80,7 @@
- /libgifcodec
  /libjingle/source
  /libupnp
+ /libva-fake-driver/src
 +#/libjxl/src
  /llvm
  /llvm-allocated-type
@@ -419,7 +419,7 @@ diff --git a/third_party/blink/common/loader/network_utils.cc b/third_party/blin
 diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink/common/mime_util/mime_util.cc
 --- a/third_party/blink/common/mime_util/mime_util.cc
 +++ b/third_party/blink/common/mime_util/mime_util.cc
-@@ -14,6 +14,7 @@
+@@ -16,6 +16,7 @@
  #include "media/media_buildflags.h"
  #include "net/base/mime_util.h"
  #include "third_party/blink/public/common/buildflags.h"
@@ -427,19 +427,16 @@ diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink
  
  #if !BUILDFLAG(IS_IOS)
  // iOS doesn't use and must not depend on //media
-@@ -144,6 +145,12 @@ MimeUtil::MimeUtil() {
+@@ -44,6 +45,9 @@ constexpr auto kSupportedImageTypes = base::MakeFixedFlatSet<std::string_view>({
-     non_image_types_.insert(type);
+ #if BUILDFLAG(ENABLE_AV1_DECODER)
-   for (const char* type : kSupportedImageTypes)
+     "image/avif",
-     image_types_.insert(type);
+ #endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
-+  // TODO(firsching): Add "image/jxl" to the kSupportedImageTypes array when the
++    "image/jxl",
-+  // JXL feature is shipped.
-+  if (base::FeatureList::IsEnabled(features::kJXL))
-+    image_types_.insert("image/jxl");
 +#endif
-   for (const char* type : kUnsupportedTextTypes)
+ });
-     unsupported_text_types_.insert(type);
+ 
-   for (const char* type : kSupportedJavascriptTypes) {
+ //  Support every script type mentioned in the spec, as it notes that "User
 diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_party/blink/common/mime_util/mime_util_unittest.cc
 --- a/third_party/blink/common/mime_util/mime_util_unittest.cc
 +++ b/third_party/blink/common/mime_util/mime_util_unittest.cc
@@ -467,7 +464,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -4346,6 +4346,7 @@ domain Emulation
+@@ -4690,6 +4690,7 @@ domain Emulation
    experimental type DisabledImageType extends string
      enum
        avif
@@ -478,7 +475,7 @@ diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/t
 diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
-@@ -500,10 +500,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
+@@ -497,10 +497,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 +489,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent
      header.Replace(String(type + ","), "");
    }
    return AtomicString(header);
-@@ -848,6 +848,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
+@@ -844,6 +844,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
    namespace DisabledImageTypeEnum = protocol::Emulation::DisabledImageTypeEnum;
    for (protocol::Emulation::DisabledImageType type : *disabled_types) {
      if (DisabledImageTypeEnum::Avif == type ||
@@ -584,8 +581,8 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/fuzzer_seed_corpus/gen
 diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.cc b/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.cc
 --- a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.cc
 +++ b/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.cc
-@@ -3,8 +3,10 @@
+@@ -5,8 +5,10 @@
- // found in the LICENSE file.
+ #include <string>
  
  #include "base/run_loop.h"
 +#include "base/test/scoped_feature_list.h"
@@ -595,9 +592,9 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
  #include "third_party/blink/renderer/bindings/core/v8/to_v8_traits.h"
  #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
  #include "third_party/blink/renderer/bindings/core/v8/v8_union_arraybufferallowshared_arraybufferviewallowshared_readablestream.h"
-@@ -89,6 +91,9 @@ DEFINE_BINARY_PROTO_FUZZER(
+@@ -87,6 +89,9 @@ DEFINE_BINARY_PROTO_FUZZER(
-   auto scoped_gc =
+   auto page_holder = std::make_unique<DummyPageHolder>();
-       MakeScopedGarbageCollectionRequest(test_support.GetIsolate());
+   page_holder->GetFrame().GetSettings()->SetScriptEnabled(true);
  
 +  base::test::ScopedFeatureList scoped_feature_list;
 +  scoped_feature_list.InitAndEnableFeature(features::kJXL);
@@ -608,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2327,6 +2327,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2398,6 +2398,10 @@ source_set("blink_platform_unittests_sources") {
      sources += [ "text/locale_icu_test.cc" ]
    }
  
@@ -619,10 +616,10 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
    sources += [ "testing/run_all_tests.cc" ]
  
    configs += [
-@@ -2369,6 +2373,7 @@ source_set("blink_platform_unittests_sources") {
+@@ -2444,6 +2448,7 @@ source_set("blink_platform_unittests_sources") {
-     "//third_party/blink/renderer/platform/network:unit_tests",
-     "//third_party/blink/renderer/platform/scheduler:unit_tests",
      "//third_party/blink/renderer/platform/wtf",
+     "//third_party/dawn/src/dawn/native",
+     "//third_party/dawn/src/dawn/wire",
 +    "//third_party/libjxl:libjxl",
      "//third_party/libyuv",
      "//third_party/webrtc/api/task_queue:task_queue_test",
@@ -677,8 +674,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
-@@ -72,6 +72,15 @@ component("image_decoders") {
+@@ -77,6 +77,15 @@ component("image_decoders") {
-     "//third_party/libyuv",
+     "//ui/gfx/geometry:geometry_skia",
    ]
  
 +  if (enable_jxl_decoder) {
@@ -696,7 +693,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third
 diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
-@@ -24,6 +24,7 @@
+@@ -30,6 +30,7 @@
  
  #include "base/containers/heap_array.h"
  #include "base/logging.h"
@@ -704,25 +701,18 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  #include "base/numerics/byte_conversions.h"
  #include "base/numerics/safe_conversions.h"
  #include "base/trace_event/trace_event.h"
-@@ -31,6 +32,7 @@
+@@ -56,6 +57,10 @@
- #include "media/media_buildflags.h"
+ #include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.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"
-@@ -48,6 +50,9 @@
- #include "third_party/blink/renderer/platform/image-decoders/avif/avif_image_decoder.h"
  #endif
  
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +#include "third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.h"
 +#endif
++
  namespace blink {
  
  namespace {
-@@ -75,6 +80,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
+@@ -83,6 +88,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
    if (image_extension == "avif") {
      return cc::ImageType::kAVIF;
    }
@@ -734,7 +724,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  #endif
    return cc::ImageType::kInvalid;
  }
-@@ -192,6 +202,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
+@@ -204,6 +214,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
      return "image/avif";
    }
  #endif
@@ -747,10 +737,10 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  
    return String();
  }
-@@ -297,6 +313,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
+@@ -319,6 +335,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
-     decoder = std::make_unique<AVIFImageDecoder>(
+           alpha_option, high_bit_depth_decoding_option, color_behavior,
-         alpha_option, high_bit_depth_decoding_option, color_behavior,
+           aux_image, max_decoded_bytes, animation_option);
-         max_decoded_bytes, animation_option);
+     }
 +#endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +  } else if (base::FeatureList::IsEnabled(blink::features::kJXL) &&
@@ -765,7 +755,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_de
 new file mode 100644
 --- /dev/null
 +++ b/third_party/blink/renderer/platform/image-decoders/jxl/jxl_image_decoder.cc
-@@ -0,0 +1,685 @@
+@@ -0,0 +1,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 +782,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;
++    list[c].table_entries = 0;
-+    profile.trc[c].parametric = tf;
++    list[c].parametric = tf;
 +  }
 +  return profile;
 +}
@@ -1557,7 +1548,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.
 +
@@ -2224,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
 diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
 --- a/third_party/blink/web_tests/TestExpectations
 +++ b/third_party/blink/web_tests/TestExpectations
-@@ -4717,6 +4717,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -5454,6 +5454,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 ]
  
@@ -2240,9 +2231,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
-@@ -103,6 +103,15 @@
+@@ -437,6 +437,15 @@
-              "--disable-threaded-compositing", "--disable-threaded-animation"],
+     "args": ["--enable-blink-features=FractionalScrollOffsets"],
-     "expires": "Jul 1, 2023"
+     "expires": "Jun 1, 2025"
    },
 +  {
 +    "prefix": "jxl-enabled",
@@ -2254,7 +2245,7 @@ diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/w
 +    "expires": "Jul 1, 2023"
 +  },
    {
-     "prefix": "unsafe_webgpu",
+     "prefix": "scalefactor200",
      "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
@@ -2655,7 +2646,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -21593,6 +21593,7 @@ from previous Chrome versions.
+@@ -20910,6 +20910,7 @@ from previous Chrome versions.
    <int value="188610022" label="NewMessageListView:enabled"/>
    <int value="189728101" label="FasterLocationReload:disabled"/>
    <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
@@ -2666,7 +2657,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"/>
@@ -2674,5 +2665,5 @@ diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/h
 +  <int value="8" label="kImageJXL"/>
  </enum>
  
- <enum name="DigitalIdentityRequestStatus">
+ <enum name="DigitalIdentityInterstitialClosedReason">
 --

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 {
+@@ -116,6 +116,8 @@ enum ReasonForCallingCanExecuteScripts {
  
  enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
  
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -313,6 +313,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -291,6 +291,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
    }
  }
  
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
  unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
    base::AutoLock locker(WebGLContextLimitLock());
    DCHECK(webgl_context_limits_initialized_);
-@@ -586,25 +593,6 @@ static String ExtractWebGLContextCreationError(
+@@ -560,25 +567,6 @@ static String ExtractWebGLContextCreationError(
      const Platform::GraphicsInfo& info) {
    StringBuilder builder;
    builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
    FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                            builder);
    builder.Append('.');
-@@ -664,6 +652,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -638,6 +626,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
      const CanvasContextCreationAttributesCore& attributes,
      Platform::ContextType context_type,
      Platform::GraphicsInfo* graphics_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
-@@ -1978,6 +1978,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+@@ -1926,6 +1926,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -195,22 +195,22 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -838,6 +839,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -936,6 +937,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+       // |request_multiple_routes|. Whether local IP addresses could be
+       // collected depends on if mic/camera permission is granted for this
        // origin.
-       WebRTCIPHandlingPolicy policy =
-           GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
 +      blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient();
 +      if (settings && settings->AllowContentSetting(ContentSettingsType::WEBRTC, false)) {
-+        policy = kDefault;
++        webrtc_ip_handling_policy = mojom::blink::WebRtcIpHandlingPolicy::kDefault;
 +      }
 +
-       switch (policy) {
+       switch (webrtc_ip_handling_policy) {
          // TODO(guoweis): specify the flag of disabling local candidate
          // collection when webrtc is updated.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
-@@ -12,6 +12,8 @@
+@@ -13,6 +13,8 @@
  #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
  #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
@@ -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"
-@@ -312,6 +314,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -284,6 +286,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  
@@ -237,7 +237,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
-@@ -17,6 +17,8 @@
+@@ -18,6 +18,8 @@
  #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
  #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
@@ -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"
-@@ -1070,6 +1072,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1031,6 +1033,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) {
++  if (!opener.GetFrame()->Loader().GetDocumentLoader()->GetContentSettings()->allow_popup) {
-+    exception_state.ThrowDOMException(DOMExceptionCode::kNotAllowedError,
++    resolver->RejectWithDOMException(DOMExceptionCode::kNotAllowedError,
-+                                      "Document PiP requires user popup permission");
++                                     "Document PiP requires user popup permission");
-+    resolver->Reject(exception_state);
 +    return;
 +  }
 +

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

@@ -7,24 +7,25 @@ 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_header_parser.cc         |  1 +
  net/reporting/reporting_service.cc               |  6 ++++++
- services/network/network_context.h               |  4 ++--
+ services/network/network_context.h               |  6 +++---
+ services/network/public/cpp/parsed_headers.cc    |  1 +
  services/network/public/mojom/BUILD.gn           |  1 -
- .../network/public/mojom/network_context.mojom   |  2 ++
+ .../network/public/mojom/network_context.mojom   |  3 +++
  .../core/frame/csp/content_security_policy.cc    |  3 +++
  .../blink/renderer/core/frame/local_frame.cc     |  3 +++
  .../blink/renderer/core/frame/local_frame.h      |  4 +++-
  .../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(-)
+ 21 files changed, 61 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,15 +42,15 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1417,6 +1417,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1470,6 +1470,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
 +#if BUILDFLAG(ENABLE_REPORTING)
  std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
    std::vector<GURL> urls;
-   frame_host->ForEachRenderFrameHostWithAction(
+   frame_host->ForEachRenderFrameHostImplWithAction(
-@@ -1430,6 +1431,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1483,6 +1484,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -82,22 +83,64 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
          kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
    }
 +#if BUILDFLAG(ENABLE_REPORTING)
-+  const absl::optional<std::string>& endpoint =
++  const std::optional<std::string>& endpoint =
 +      report_only ? report_only_endpoint_ : endpoint_;
    if (endpoint) {
      base::Value::Dict body_to_pass;
      for (const auto& pair : body) {
-@@ -126,6 +128,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+@@ -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
+diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browser/network/reporting_service_proxy.cc
---- a/content/browser/network/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/network/reporting_service_proxy.cc
-+++ b/content/browser/network/cross_origin_opener_policy_reporter.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"
+@@ -190,12 +191,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
+@@ -15258,12 +15258,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 +176,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) {
+@@ -64,6 +57,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
-       return "restrict-properties-plus-coep";
+       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 +192,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,68 +207,26 @@ 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_,
+       network_anonymization_key_, std::move(body));
-       /*user_agent=*/std::nullopt, 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
-@@ -14056,12 +14056,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
-       }
-     }
-   }
--
--  // Send the crash report to the Reporting API.
--  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
--      /*type=*/"crash", /*group=*/"default", last_committed_url_,
--      GetReportingSource(), isolation_info_.network_anonymization_key(),
--      /*user_agent=*/std::nullopt, std::move(body));
- }
- 
- void RenderFrameHostImpl::SendCommitNavigation(
 diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
-@@ -128,6 +128,7 @@ void ReportResult(
+@@ -127,6 +127,7 @@ void ReportResult(
-     int frame_tree_node_id,
+     FrameTreeNodeId frame_tree_node_id,
      network::mojom::SignedExchangeReportPtr report,
      const net::NetworkAnonymizationKey& network_anonymization_key) {
 +#if BUILDFLAG(ENABLE_REPORTING)
    FrameTreeNode* frame_tree_node =
        FrameTreeNode::GloballyFindByID(frame_tree_node_id);
    if (!frame_tree_node)
-@@ -142,6 +143,7 @@ void ReportResult(
+@@ -141,6 +142,7 @@ void ReportResult(
    DCHECK(partition);
    partition->GetNetworkContext()->QueueSignedExchangeReport(
        std::move(report), network_anonymization_key);
@@ -251,24 +252,24 @@ new file mode 100644
 @@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kNetworkErrorLogging);
 +SET_CROMITE_FEATURE_DISABLED(kReporting);
-diff --git a/net/base/features.cc b/net/base/features.cc
+diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
---- a/net/base/features.cc
+--- a/net/reporting/reporting_header_parser.cc
-+++ b/net/base/features.cc
++++ b/net/reporting/reporting_header_parser.cc
-@@ -222,6 +222,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
+@@ -332,6 +332,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
-     base::Seconds(30));
+     const NetworkAnonymizationKey& network_anonymization_key,
- 
+     const url::Origin& origin,
- #if BUILDFLAG(ENABLE_REPORTING)
+     base::flat_map<std::string, std::string> header) {
-+#error Attempting to build with enable_reporting
++  CHECK(false);
- BASE_FEATURE(kDocumentReporting,
+   DCHECK(GURL::SchemeIsCryptographic(origin.scheme()));
-              "DocumentReporting",
+   DCHECK(!reporting_source.is_empty());
-              base::FEATURE_ENABLED_BY_DEFAULT);
+   DCHECK(network_anonymization_key.IsEmpty() ||
 diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
 --- a/net/reporting/reporting_service.cc
 +++ b/net/reporting/reporting_service.cc
-@@ -214,6 +214,12 @@ class ReportingServiceImpl : public ReportingService {
+@@ -225,6 +225,12 @@ class ReportingServiceImpl : public ReportingService {
-       base::Value::Dict body,
        int depth,
-       base::TimeTicks queued_ticks) {
+       base::TimeTicks queued_ticks,
+       ReportingTargetType target_type) {
 +#if BUILDFLAG(ENABLE_REPORTING)
 +    if ((true))
 +      return;
@@ -276,17 +277,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(
+     context_->cache()->AddReport(reporting_source, network_anonymization_key,
-         reporting_source, network_anonymization_key, sanitized_url, user_agent,
+                                  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
+@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+       const GURL& url,
        const std::optional<base::UnguessableToken>& reporting_source,
        const net::NetworkAnonymizationKey& network_anonymization_key,
-       const std::optional<std::string>& user_agent,
 -      base::Value::Dict body) override;
 +      base::Value::Dict body);
+   void QueueEnterpriseReport(const std::string& type,
+                              const std::string& group,
+                              const GURL& url,
+-                             base::Value::Dict body) override;
++                             base::Value::Dict body);
    void QueueSignedExchangeReport(
        mojom::SignedExchangeReportPtr report,
 -      const net::NetworkAnonymizationKey& network_anonymization_key) override;
@@ -294,10 +300,21 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
    void AddDomainReliabilityContextForTesting(
        const url::Origin& origin,
        const GURL& upload_url,
+diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/public/cpp/parsed_headers.cc
+--- a/services/network/public/cpp/parsed_headers.cc
++++ b/services/network/public/cpp/parsed_headers.cc
+@@ -115,6 +115,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+   }
+ 
+ #if BUILDFLAG(ENABLE_REPORTING)
++#error Attempting to build with enable_reporting
+   if (std::optional<std::string> reporting_endpoints =
+           headers->GetNormalizedHeader("Reporting-Endpoints")) {
+     parsed_headers->reporting_endpoints =
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1467,7 +1467,6 @@ mojom("mojom") {
+@@ -1557,7 +1557,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 +325,26 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1221,6 +1221,7 @@ interface NetworkContext {
+@@ -1208,6 +1208,7 @@ interface NetworkContext {
-   // provided |network_isolation_key|.
+   // provided `network_anonymization_key`.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
 +  [EnableIf=enable_reporting]
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1234,6 +1235,7 @@ interface NetworkContext {
+@@ -1215,6 +1216,7 @@ interface NetworkContext {
+               NetworkAnonymizationKey network_anonymization_key,
+               mojo_base.mojom.DictionaryValue body);
+ 
++  [EnableIf=enable_reporting]
+   QueueEnterpriseReport(string type,
+                         string group,
+                         url.mojom.Url url,
+@@ -1225,6 +1227,7 @@ interface NetworkContext {
    // Note that this queued report will never be delivered if no reporting
    // endpoint matching is registered for with the provided
-   // |network_isolation_key|.
+   // `network_anonymization_key`.
 +  [EnableIf=enable_reporting]
    QueueSignedExchangeReport(SignedExchangeReport report,
                              NetworkAnonymizationKey network_anonymization_key);
@@ -327,15 +352,15 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
 diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 --- a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 +++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
- #include <optional>
+ #include <set>
  #include <utility>
  
 +#include "net/net_buildflags.h"
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/ranges/algorithm.h"
-@@ -1215,6 +1216,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1284,6 +1285,7 @@ void ContentSecurityPolicy::ReportViolation(
      return;
    }
  
@@ -343,7 +368,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);
  
-@@ -1222,6 +1224,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1291,6 +1293,7 @@ void ContentSecurityPolicy::ReportViolation(
    // `context_frame` (i.e. we're not processing 'frame-ancestors').
    if (delegate_ && !context_frame)
      delegate_->DispatchViolationEvent(*violation_data, element);
@@ -354,7 +379,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -45,6 +45,7 @@
+@@ -46,6 +46,7 @@
  #include "build/build_config.h"
  #include "mojo/public/cpp/bindings/self_owned_receiver.h"
  #include "mojo/public/cpp/system/message_pipe.h"
@@ -362,8 +387,8 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
  #include "services/network/public/mojom/source_location.mojom-blink.h"
-@@ -2670,9 +2671,11 @@ void LocalFrame::MainFrameFirstMeaningfulPaint() {
+@@ -2791,9 +2792,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
-   v8_local_compile_hints_producer_->GenerateData(kIsFinalData);
+   return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
  }
  
 +#if BUILDFLAG(ENABLE_REPORTING)
@@ -385,7 +410,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -661,8 +662,9 @@ class CORE_EXPORT LocalFrame final
+@@ -660,8 +661,9 @@ class CORE_EXPORT LocalFrame final
    void FinishedScrollSequence();
  
    SmoothScrollSequencer* GetSmoothScrollSequencer() const;
@@ -404,10 +429,10 @@ 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";
+@@ -58,7 +59,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
  ReportingContext::ReportingContext(ExecutionContext& context)
      : Supplement<ExecutionContext>(context),
        execution_context_(context),
@@ -417,7 +442,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
        receiver_(this, &context) {}
  
  // static
-@@ -117,7 +120,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
+@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
    visitor->Trace(observers_);
    visitor->Trace(report_buffer_);
    visitor->Trace(execution_context_);
@@ -427,7 +452,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
    visitor->Trace(receiver_);
    Supplement<ExecutionContext>::Trace(visitor);
  }
-@@ -139,6 +144,7 @@ void ReportingContext::CountReport(Report* report) {
+@@ -148,6 +153,7 @@ void ReportingContext::CountReport(Report* report) {
    UseCounter::Count(execution_context_, feature);
  }
  
@@ -435,23 +460,23 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
  const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
  ReportingContext::GetReportingService() const {
    if (!reporting_service_.is_bound()) {
-@@ -148,6 +154,7 @@ ReportingContext::GetReportingService() const {
+@@ -157,6 +163,7 @@ ReportingContext::GetReportingService() const {
    }
    return reporting_service_;
  }
 +#endif
  
  void ReportingContext::NotifyInternal(Report* report) {
-   // Buffer the report.
+   if (!ShouldReportBeVisibleToObservers(report)) {
-@@ -170,6 +177,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+@@ -183,6 +190,7 @@ void ReportingContext::NotifyInternal(Report* report) {
  
  void ReportingContext::SendToReportingAPI(Report* report,
                                            const String& endpoint) const {
 +#if BUILDFLAG(ENABLE_REPORTING)
    const String& type = report->type();
-   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
+   if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
-         type == ReportType::kPermissionsPolicyViolation ||
+         type == ReportType::kDeprecation ||
-@@ -227,6 +235,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+@@ -246,6 +254,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
          url, endpoint, body->featureId(), body->disposition(), body->message(),
          body->sourceFile(), line_number, column_number);
    }

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

@@ -4,71 +4,67 @@ 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/BUILD.gn                                    | 1 -
- .../browser/feed/FeedSurfaceCoordinator.java  |  5 +----
+ .../chrome/browser/feedback/ChromeFeedbackCollector.java   | 1 -
- chrome/browser/BUILD.gn                       |  2 --
+ chrome/browser/feedback/android/BUILD.gn                   | 2 --
- .../prefs/chrome_pref_service_factory.cc      |  2 +-
+ chrome/browser/prefs/chrome_pref_service_factory.cc        | 2 +-
- .../profiles/profile_attributes_entry.cc      |  2 +-
+ chrome/browser/profiles/profile_attributes_entry.cc        | 2 +-
- chrome/browser/profiles/profile_impl.cc       |  5 +----
+ chrome/browser/profiles/profile_impl.cc                    | 5 +----
- chrome/browser/profiles/profile_manager.cc    | 20 -------------------
+ chrome/browser/profiles/profile_manager.cc                 | 7 -------
- chrome/browser/ui/webui/managed_ui_handler.cc |  4 ----
+ chrome/browser/ui/webui/managed_ui_handler.cc              | 4 ----
- .../webui/management/management_ui_handler.cc |  5 -----
+ .../browser/ui/webui/management/management_ui_handler.cc   | 4 ----
- .../browser/supervised_user_pref_store.cc     |  1 +
+ .../core/browser/supervised_user_pref_store.cc             | 1 +
- .../browser/supervised_user_preferences.cc    |  6 +++++-
+ .../core/browser/supervised_user_preferences.cc            | 6 +++++-
- .../core/browser/supervised_user_service.cc   |  1 +
+ .../core/browser/supervised_user_service.cc                | 5 +----
- .../core/browser/supervised_user_utils.cc     |  1 +
+ .../supervised_user/core/browser/supervised_user_utils.cc  | 1 +
- .../supervised_user/core/common/features.cc   |  6 ++++++
+ components/supervised_user/core/common/features.cc         | 6 ++++++
- 14 files changed, 18 insertions(+), 43 deletions(-)
+ 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
-@@ -749,7 +749,6 @@ if (current_toolchain == default_toolchain) {
+@@ -774,7 +774,6 @@ if (current_toolchain == default_toolchain) {
-       "//components/dom_distiller/core:distiller_type_java",
-       "//components/ntp_tiles:ntp_tiles_enums_java",
        "//components/offline_pages/core:offline_page_model_enums_java",
+       "//components/sharing_message:sharing_dialog_type_generated_enum",
+       "//components/sharing_message:sharing_send_message_result_generated_enum",
 -      "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
-       "//net:effective_connection_type_java",
      ]
  
-diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
+     # From java_sources.gni.
---- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
+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
-+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
-@@ -68,7 +68,6 @@ import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
++++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
- import org.chromium.components.feature_engagement.EventConstants;
+@@ -91,7 +91,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
- import org.chromium.components.feature_engagement.Tracker;
+         // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
- import org.chromium.components.prefs.PrefService;
+         // incognito profile.
--import org.chromium.components.supervised_user.SupervisedUserPreferences;
+         if (!initParams.profile.isOffTheRecord()) {
- import org.chromium.components.user_prefs.UserPrefs;
+-            sources.add(new FamilyInfoFeedbackSource(initParams.profile));
- import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
+         }
- import org.chromium.ui.base.DeviceFormFactor;
-@@ -753,9 +752,7 @@ public class FeedSurfaceCoordinator
-      * Returns true if the supervised user feed should be displayed.
-      */
-     public boolean shouldDisplaySupervisedFeed() {
--        PrefService prefService = UserPrefs.get(mProfile);
--        return SupervisedUserPreferences.isSubjectToParentalControls(prefService)
--                && ChromeFeatureList.isEnabled(ChromeFeatureList.KID_FRIENDLY_CONTENT_FEED);
-+        return false;
-     }
  
-     /**
+         return sources;
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/android/BUILD.gn
---- a/chrome/browser/BUILD.gn
+--- a/chrome/browser/feedback/android/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
++++ b/chrome/browser/feedback/android/BUILD.gn
-@@ -3237,8 +3237,6 @@ static_library("browser") {
+@@ -8,7 +8,6 @@ import("//third_party/jni_zero/jni_zero.gni")
-       "feed/android/refresh_task_scheduler_impl.cc",
+ 
-       "feed/android/refresh_task_scheduler_impl.h",
+ generate_jni("jni_headers") {
-       "feed/android/web_feed_bridge.cc",
+   sources = [
--      "feedback/android/family_info_feedback_source.cc",
+-    "java/src/org/chromium/chrome/browser/feedback/FamilyInfoFeedbackSource.java",
--      "feedback/android/family_info_feedback_source.h",
+     "java/src/org/chromium/chrome/browser/feedback/ProcessIdFeedbackSource.java",
-       "file_select_helper_contacts_android.cc",
+     "java/src/org/chromium/chrome/browser/feedback/SystemInfoFeedbackSource.java",
-       "file_select_helper_contacts_android.h",
+   ]
-       "first_run/android/first_run_prefs.cc",
+@@ -56,7 +55,6 @@ android_library("java") {
+     "java/src/org/chromium/chrome/browser/feedback/AsyncFeedbackSourceAdapter.java",
+     "java/src/org/chromium/chrome/browser/feedback/DeviceInfoFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/FallbackHelpAndFeedbackLauncherDelegate.java",
+-    "java/src/org/chromium/chrome/browser/feedback/FamilyInfoFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/FeedbackContextFeedbackSource.java",
+     "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncher.java",
+     "java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherDelegate.java",
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -317,7 +317,7 @@ void PrepareFactory(
+@@ -331,7 +331,7 @@ void PrepareFactory(
      policy::BrowserPolicyConnector* policy_connector) {
    factory->SetManagedPolicies(policy_service, policy_connector);
    factory->SetRecommendedPolicies(policy_service, policy_connector);
@@ -80,7 +76,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -422,7 +422,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -459,7 +459,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
  }
  
  std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -92,7 +88,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -690,10 +690,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -670,10 +670,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
      prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
  
    pref_change_registrar_.Init(prefs);
@@ -103,7 +99,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
  
    // Changes in the profile avatar.
    pref_change_registrar_.Add(
-@@ -1631,6 +1627,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1625,6 +1621,7 @@ GURL ProfileImpl::GetHomePage() {
  }
  
  void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -114,44 +110,31 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1214,23 +1214,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1178,10 +1178,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
      profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
    }
  
--  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+-  if (!profile->GetPrefs()->HasPrefPath(prefs::kSupervisedUserId)) {
--  bool force_supervised_user_id =
--#if BUILDFLAG(IS_CHROMEOS_ASH)
--      !ash::IsSigninBrowserContext(profile) &&
--      !ash::IsLockScreenAppBrowserContext(profile) &&
--#endif
--      command_line->HasSwitch(switches::kSupervisedUserId);
--
--  if (force_supervised_user_id) {
--    supervised_user_id =
--        command_line->GetSwitchValueASCII(switches::kSupervisedUserId);
--  }
--  if (force_supervised_user_id ||
--      !profile->GetPrefs()->HasPrefPath(prefs::kSupervisedUserId)) {
 -    profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
 -                                   supervised_user_id);
 -  }
  #if !BUILDFLAG(IS_ANDROID)
    if (profile->IsNewProfile()) {
      profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
-@@ -2038,9 +2021,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -1962,9 +1958,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
 -  init_params.supervised_user_id =
 -      profile->GetPrefs()->GetString(prefs::kSupervisedUserId);
 -
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
    user_manager::User* user =
        ash::ProfileHelper::Get()->GetUserByProfile(profile);
 diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc
 --- a/chrome/browser/ui/webui/managed_ui_handler.cc
 +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
-@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() {
+@@ -90,10 +90,6 @@ void ManagedUIHandler::AddObservers() {
      auto domain = static_cast<policy::PolicyDomain>(i);
      policy_service->AddObserver(domain, this);
    }
@@ -165,22 +148,21 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -1496,11 +1496,6 @@ void ManagementUIHandler::AddObservers() {
+@@ -578,10 +578,6 @@ bool ManagementUIHandler::managed() const {
- 
-   pref_registrar_.Init(profile->GetPrefs());
  
+ void ManagementUIHandler::RegisterPrefChange(
+     PrefChangeRegistrar& pref_registrar) {
 -  pref_registrar_.Add(
 -      prefs::kSupervisedUserId,
 -      base::BindRepeating(&ManagementUIHandler::UpdateManagedState,
 -                          base::Unretained(this)));
--
+ }
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ 
-   pref_registrar_.Add(
+ void ManagementUIHandler::UpdateManagedState() {
-       plugin_vm::prefs::kPluginVmDataCollectionAllowed,
 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() {}
+@@ -126,6 +126,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() = default;
  
  void SupervisedUserPrefStore::OnNewSettingsAvailable(
      const base::Value::Dict& settings) {
@@ -191,7 +173,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.
 diff --git a/components/supervised_user/core/browser/supervised_user_preferences.cc b/components/supervised_user/core/browser/supervised_user_preferences.cc
 --- a/components/supervised_user/core/browser/supervised_user_preferences.cc
 +++ b/components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -162,6 +162,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -155,6 +155,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
  }
  
  void EnableParentalControls(PrefService& pref_service) {
@@ -202,7 +184,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
    pref_service.SetString(prefs::kSupervisedUserId,
                           supervised_user::kChildAccountSUID);
    SetIsChildAccountStatusKnown(pref_service);
-@@ -184,7 +188,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
+@@ -177,7 +181,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
  }
  
  bool IsSubjectToParentalControls(const PrefService& pref_service) {
@@ -210,11 +192,22 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 +  return false;
  }
  
- bool AreExtensionsPermissionsEnabled(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
-@@ -189,6 +189,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState(
+@@ -49,10 +49,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)));
+   SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get()));
+ }
+ 
+@@ -138,6 +134,7 @@ SupervisedUserService::SupervisedUserService(
  }
  
  void SupervisedUserService::SetActive(bool active) {
@@ -225,7 +218,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/components/supervised_user/core/browser/supervised_user_utils.cc
 --- a/components/supervised_user/core/browser/supervised_user_utils.cc
 +++ b/components/supervised_user/core/browser/supervised_user_utils.cc
-@@ -99,6 +99,7 @@ GURL NormalizeUrl(const GURL& url) {
+@@ -145,6 +145,7 @@ GURL NormalizeUrl(const GURL& url) {
  }
  
  bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
@@ -236,8 +229,8 @@ diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -122,4 +122,10 @@ bool IsShadowKidsApiWithSafeSitesEnabled() {
+@@ -196,4 +196,10 @@ bool IsKidFriendlyContentFeedAvailable() {
-   return base::FeatureList::IsEnabled(kShadowKidsApiWithSafeSites);
+   return base::FeatureList::IsEnabled(kKidFriendlyContentFeed);
  }
  
 +SET_CROMITE_FEATURE_DISABLED(kKidFriendlyContentFeed);

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

@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1197,6 +1197,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1309,6 +1309,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
-   return pipeline_metadata_.has_audio;
+   pipeline_controller_->OnSelectedVideoTrackChanged(selected);
  }
  
 +bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
@@ -22,9 +22,9 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +}
 +
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
+     const WebVector<WebMediaPlayer::TrackId>& enabled_track_ids) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3541,7 +3547,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3710,7 +3716,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
            : HasAudio();
  
    // Audio only stream is allowed to play when in background.
@@ -47,6 +47,6 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b
 +  bool HasVideoNonEmptySize() const;
 +
    void EnabledAudioTracksChanged(
-       const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
+       const WebVector<WebMediaPlayer::TrackId>& enabled_track_ids) override;
    void SelectedVideoTrackChanged(
 --

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(-)
@@ -10,7 +12,7 @@ Always enable 'inspect fallback' in 'chrome://inspect/#devices'
 diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resources/inspect/inspect.js
 --- a/chrome/browser/resources/inspect/inspect.js
 +++ b/chrome/browser/resources/inspect/inspect.js
-@@ -50,6 +50,7 @@ if ('browser-inspector' in queryParamsObject) {
+@@ -45,6 +45,7 @@ if ('browser-inspector' in queryParamsObject) {
  })();
  
  function isVersionNewerThanHost(version) {
@@ -18,7 +20,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resour
    if (!HOST_CHROME_VERSION) {
      return false;
    }
-@@ -561,7 +562,7 @@ function formatValue(data, property) {
+@@ -566,7 +567,7 @@ function formatValue(data, property) {
  function addFavicon(row, data) {
    const favicon = document.createElement('img');
    if (data['faviconUrl']) {

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(+)
@@ -17,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -35,6 +36,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -34,6 +35,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
  import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
  import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
  import org.chromium.chrome.browser.profiles.Profile;
@@ -25,7 +26,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  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 {
+@@ -235,6 +237,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 {
+@@ -255,6 +258,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
- 
+      * @param url The URL to open.
-     @Override
+      */
      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

@@ -7,20 +7,21 @@ Ignore any partner-provided home page.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ----
+ .../partnerbookmarks/PartnerBookmarksProviderIterator.java    | 1 +
  .../partnercustomizations/PartnerBrowserCustomizations.java   | 2 +-
  .../org/chromium/components/search_engines/TemplateUrl.java   | 1 +
  .../search_engines/android/template_url_service_android.cc    | 1 +
  .../always-use-new-tab-page-for-default-home-page.inc         | 2 ++
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ 6 files changed, 6 insertions(+), 5 deletions(-)
  create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -152,10 +152,6 @@ public class HomepageManager
+@@ -155,10 +155,6 @@ public class HomepageManager
-      *         tab page if the homepage button is force enabled via flag.
+      *     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();
 -        }
@@ -28,10 +29,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
          String homepagePartnerDefaultGurlSerialized =
                  ChromeSharedPreferences.getInstance()
                          .readString(
+diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
+--- a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
++++ b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
+@@ -61,6 +61,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
+      * @return Iterator over bookmarks or null.
+      */
+     public static PartnerBookmarksProviderIterator createIfAvailable() {
++        if ((true)) return null;
+         try {
+             Cursor cursor =
+                     ContextUtils.getApplicationContext()
 diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -212,7 +212,7 @@ public class PartnerBrowserCustomizations {
+@@ -210,7 +210,7 @@ public class PartnerBrowserCustomizations {
                                                              & ApplicationInfo.FLAG_SYSTEM)
                                                      == 1
                                              || !VersionInfo.isStableBuild();
@@ -43,7 +55,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 +66,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,
+         jimage_translate_target_language_param_key) {
-     jboolean set_as_default) {
 +  if ((true)) return false;
-   // Check if there is already a search engine created from Play API.
+   // The function is scheduled to run only when the service is loaded, see
-   TemplateURLService::TemplateURLVector template_urls =
+   // `TemplateUrlService#runWhenLoaded()`.
-       template_url_service_->GetTemplateURLs();
+   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/Ask-for-restart-on-connection-change.patch

@@ -0,0 +1,784 @@
+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
+@@ -468,7 +468,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.lifetime.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
+@@ -1233,7 +1233,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
+@@ -199,6 +199,13 @@ public abstract class TabModelSelectorBase
+         return null;
+     }
+ 
++    @Override
++    public void setPagesFrozen(boolean frozen) {
++        for (int i = 0; i < getModels().size(); i++) {
++            TabModelUtils.setPagesFrozen(mTabModels.get(i), frozen);
++        }
++    }
++
+     @Override
+     public @NonNull TabModel getCurrentModel() {
+         if (mTabModelInternals.size() == 0) return EmptyTabModel.getInstance(false);
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
+@@ -0,0 +1,32 @@
++/*
++    This file is part of Cromite.
++
++    Cromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Cromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++package org.chromium.chrome.browser.flags.cromite;
++
++import org.chromium.components.cached_flags.CachedFlag;
++import org.chromium.chrome.browser.flags.ChromeFeatureMap;
++
++public class sAskForRestartOnConnectionChange {
++    private static final CachedFlag sInstance =
++        new CachedFlag(ChromeFeatureMap.getInstance(), "AskForRestartOnConnectionChange", false);
++
++    private sAskForRestartOnConnectionChange() {}
++
++    public static CachedFlag getInstance() {
++        return sInstance;
++    }
++}
+diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
+--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
++++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
+@@ -147,6 +147,8 @@ public interface TabModelSelector {
+     /** Get total tab count across all tab models */
+     int getTotalTabCount();
+ 
++    void setPagesFrozen(boolean frozen);
++
+     /**
+      * Search all TabModels for a tab with the specified id.
+      * @return specified tab or null if tab is not found
+diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
+--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
++++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
+@@ -17,12 +17,16 @@ import org.chromium.base.supplier.SupplierUtils;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabSelectionType;
+ import org.chromium.content_public.browser.WebContents;
++import org.chromium.content_public.browser.Visibility;
+ import org.chromium.ui.base.WindowAndroid;
+ 
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.List;
+ import java.util.function.Predicate;
++import java.util.Collections;
++import java.util.stream.IntStream;
++import java.util.stream.Collectors;
+ 
+ /**
+  * A set of convenience methods used for interacting with {@link TabList}s and {@link TabModel}s.
+@@ -55,6 +59,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
+@@ -107,6 +107,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
+@@ -459,6 +459,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="@dimen/snackbar_button_padding"
+             android:paddingStart="@dimen/snackbar_button_padding"
+             style="@style/TextButton" />
++
++        <org.chromium.ui.widget.ButtonCompat
++            android:id="@+id/snackbar_dismiss"
++            android:layout_width="wrap_content"
++            android:layout_height="wrap_content"
++            android:layout_gravity="center_vertical"
++            android:paddingEnd="24dp"
++            android:paddingStart="24dp"
++            android:visibility="gone"
++            style="@style/TextButton" />
+     </LinearLayout>
+ </RelativeLayout>
+diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
+--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
++++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
+@@ -133,6 +133,8 @@ public class Snackbar {
+     private String mTemplateText;
+     private String mActionText;
+     private Object mActionData;
++    private String mDismissActionText;
++    private Object mDismissActionData;
+     private int mBackgroundColor;
+     private int mTextApperanceResId;
+     private boolean mSingleLine = true;
+@@ -235,6 +237,20 @@ public class Snackbar {
+         return this;
+     }
+ 
++    public Snackbar setDismissAction(String actionText, Object actionData) {
++        mDismissActionText = actionText;
++        mDismissActionData = actionData;
++        return this;
++    }
++
++    public String getDismissActionText() {
++        return mDismissActionText;
++    }
++
++    Object getDismissActionData() {
++        return mDismissActionData;
++    }
++
+     /**
+      * Sets the text appearance for the snackbar. If 0, the snackbar will use default text
+      * appearance.
+diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
+--- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
++++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
+@@ -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,
+@@ -147,6 +150,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+                 (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
+         mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
+         mActionButtonView.setOnClickListener(listener);
++        mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss);
++        mDismissButtonView.setOnClickListener(dismissListener);
+         mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
+         mEdgeToEdgeSupplier = edgeToEdgeSupplier;
+         if (SnackbarManager.isFloatingSnackbarEnabled()) {
+@@ -394,6 +399,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
+@@ -898,6 +898,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
+@@ -194,6 +194,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
+@@ -3727,8 +3727,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
+@@ -1157,6 +1157,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;
+@@ -1451,6 +1457,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
+@@ -289,6 +289,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
+@@ -187,6 +187,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
+@@ -4289,6 +4289,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
+@@ -3233,6 +3233,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() {
+@@ -3247,6 +3248,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
+@@ -979,7 +979,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        |  5 ++---
+ 11 files changed, 56 insertions(+), 4 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)
+@@ -197,6 +197,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
    }
  }
  
@@ -60,7 +61,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third
 +    if (NotShared<DOMFloat32Array> array = getChannelData(i)) {
 +      size_t len = array->length();
 +      if (len > 0) {
-+        float* destination = array->Data();
++        base::span<float> destination = array->AsSpan();
 +        for (unsigned j = 0; j < len; ++j) {
 +          destination[j] = BaseAudioContext::ShuffleAudioData(destination[j], j);
 +        }
@@ -87,16 +88,16 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -12,6 +12,7 @@
+@@ -13,6 +13,7 @@
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/mediastream/media_devices.h"
+ #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
 +#include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
  #include "third_party/blink/public/platform/web_audio_latency_hint.h"
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-@@ -582,7 +583,9 @@ double AudioContext::baseLatency() const {
+@@ -637,7 +638,9 @@ double AudioContext::baseLatency() const {
-   DCHECK(IsMainThread());
+   DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
    DCHECK(destination());
  
 -  return base_latency_;
@@ -117,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
  #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
  #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
  #include "third_party/blink/public/platform/platform.h"
-@@ -721,6 +722,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -709,6 +710,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -138,7 +139,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
-@@ -337,6 +337,8 @@ class MODULES_EXPORT BaseAudioContext
+@@ -327,6 +327,8 @@ class MODULES_EXPORT BaseAudioContext
    // if the execution context does not exist.
    bool CheckExecutionContextAndThrowIfNecessary(ExceptionState&);
  
@@ -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() {
+@@ -372,6 +372,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,19 @@ 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
+@@ -481,9 +481,8 @@
+     {
+       // AudioContext.playoutStats interface.
+       // https://chromestatus.com/feature/5172818344148992
+-      name: "AudioContextPlayoutStats",
+-      origin_trial_feature_name: "AudioContextPlayoutStats",
+-      status: "experimental",
++      name: "AudioContextPlayoutStats",   // keep AudioContextPlayoutStats
++      status: "experimental",             // experimental
+     },
+     {
+       name: "AudioContextSetSinkId",
 --

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(
+@@ -707,6 +707,21 @@ void ExecutionContext::WriteIntoTrace(
    proto->set_world_type(GetWorldType(*this));
  }
  
@@ -41,7 +41,6 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 +      return "local";
 +  }
 +  NOTREACHED();
-+  return "public";
 +}
 +
  bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
@@ -53,7 +52,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 @@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
-   HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
+   HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
 +  String addressSpaceForBindings() const;
    unsigned ContextLifecycleStateObserverCountForTesting() const;
  
@@ -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
-@@ -590,6 +590,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -996,6 +996,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
-@@ -166,6 +166,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -182,6 +182,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;
@@ -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) {
+@@ -288,6 +288,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
-@@ -136,9 +136,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -135,9 +135,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
      return ConnectResult::kException;
    }
  

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

@@ -0,0 +1,147 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 21 Sep 2024 14:36:25 +0000
+Subject: Block leakage of urls in sandbox iframes
+
+Preventing url base fallback leakage in cross orgin sandbox iframe.
+Addition of the ""block-url-leakage-sandbox-iframe" flag disabled by default.
+DO NOT ACTIVATE: the patch is a wip
+The aim is to understand whether it is possible to disable the
+leakage of certain information in sandbox iframes
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../browser/renderer_host/render_frame_host_impl.cc | 12 +++++++++++-
+ .../Block-url-leakage-sandbox-iframe.inc            |  8 ++++++++
+ .../Block-url-leakage-sandbox-iframe.inc            |  3 +++
+ .../features_h/Block-url-leakage-sandbox-iframe.inc |  1 +
+ third_party/blink/renderer/core/frame/location.cc   | 13 +++++++++++++
+ .../blink/renderer/core/loader/document_loader.cc   | 12 ++++++++++++
+ .../blink/renderer/core/loader/document_loader.h    |  2 +-
+ 7 files changed, 49 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+ create mode 100644 cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+
+diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
+--- a/content/browser/renderer_host/render_frame_host_impl.cc
++++ b/content/browser/renderer_host/render_frame_host_impl.cc
+@@ -4678,7 +4678,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+ }
+ 
+ void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
+-  inherited_base_url_ = inherited_base_url;
++  // we only inherit the base url if there's no sandbox,
++  // or if there is a sandbox but it has 'allow-same-origin'.
++  // See https://github.com/whatwg/html/issues/9025.
++  bool sandbox_flags_dont_exist_or_dont_include_allow_same_origin =
++      base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe) &&
++      (!policy_container_host_ ||
++      (active_sandbox_flags() & network::mojom::WebSandboxFlags::kOrigin) ==
++          network::mojom::WebSandboxFlags::kNone);
++  if (sandbox_flags_dont_exist_or_dont_include_allow_same_origin) {
++    inherited_base_url_ = inherited_base_url;
++  }
+ }
+ 
+ void RenderFrameHostImpl::SetLastCommittedOriginForTesting(
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1,8 @@
++#ifdef FLAG_SECTION
++
++    {"block-url-leakage-sandbox-iframe",
++     "Block leakage of urls in sandbox iframes",
++     "Block leakage for referrer, base url and ancestorOrigins in iframe with sandbox.", kOsAll,
++     FEATURE_VALUE_TYPE(blink::features::kBlockUrlLeakageSandboxIframe)},
++
++#endif
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1,3 @@
++CROMITE_FEATURE(kBlockUrlLeakageSandboxIframe,
++                "BlockUrlLeakageSandboxIframe",
++                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc b/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
+@@ -0,0 +1 @@
++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kBlockUrlLeakageSandboxIframe);
+diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/blink/renderer/core/frame/location.cc
+--- a/third_party/blink/renderer/core/frame/location.cc
++++ b/third_party/blink/renderer/core/frame/location.cc
+@@ -28,6 +28,7 @@
+ 
+ #include "third_party/blink/renderer/core/frame/location.h"
+ 
++#include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
+ #include "third_party/blink/renderer/core/dom/document.h"
+@@ -125,8 +126,20 @@ DOMStringList* Location::ancestorOrigins() const {
+   auto* origins = MakeGarbageCollected<DOMStringList>();
+   if (!IsAttached())
+     return origins;
++  if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
++        && dom_window_->GetFrame()->GetSecurityContext()->IsSandboxed(
++              network::mojom::WebSandboxFlags::kOrigin)) {
++    // not allow any value for sandboxed frames
++    return origins;
++  }
+   for (Frame* frame = dom_window_->GetFrame()->Tree().Parent(); frame;
+        frame = frame->Tree().Parent()) {
++    if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
++          && frame->GetSecurityContext()->IsSandboxed(
++                network::mojom::WebSandboxFlags::kOrigin)) {
++      // blocks at first sandbox frame
++      break;
++    }
+     origins->Append(
+         frame->GetSecurityContext()->GetSecurityOrigin()->ToString());
+   }
+diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
+--- a/third_party/blink/renderer/core/loader/document_loader.cc
++++ b/third_party/blink/renderer/core/loader/document_loader.cc
+@@ -820,6 +820,11 @@ WebString DocumentLoader::HttpMethod() const {
+ }
+ 
+ const AtomicString& DocumentLoader::GetReferrer() const {
++  if (base::FeatureList::IsEnabled(features::kBlockUrlLeakageSandboxIframe)
++      && frame_->DomWindow()->GetSecurityContext().IsSandboxed(
++            network::mojom::WebSandboxFlags::kOrigin)) {
++    return g_null_atom;
++  }
+   return referrer_;
+ }
+ 
+@@ -2902,6 +2907,13 @@ void DocumentLoader::CommitNavigation() {
+         response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
+   }
+ 
++  if (base::FeatureList::IsEnabled(features::kBlockUrlLeakageSandboxIframe) &&
++      frame_->DomWindow()->GetSecurityContext().IsSandboxed(
++          network::mojom::WebSandboxFlags::kOrigin)) {
++    // If an frame is sandboxed don't give it an inherited base url.
++    fallback_base_url_ = KURL();
++  }
++
+   navigation_scroll_allowed_ = !frame_->DomWindow()->IsFeatureEnabled(
+       mojom::blink::DocumentPolicyFeature::kForceLoadAtTop);
+ 
+diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
+--- a/third_party/blink/renderer/core/loader/document_loader.h
++++ b/third_party/blink/renderer/core/loader/document_loader.h
+@@ -780,7 +780,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+   // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set.
+   bool loading_main_document_from_mhtml_archive_ = false;
+   const bool loading_srcdoc_ = false;
+-  const KURL fallback_base_url_;
++  KURL fallback_base_url_; // Non-const for sandbox overrides.
+   const bool loading_url_as_empty_document_ = false;
+   const bool is_static_data_ = false;
+   CommitReason commit_reason_ = CommitReason::kRegular;
+--

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

@@ -49,7 +49,7 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
 diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -174,6 +174,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -128,6 +128,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
        continue;
      }
  
@@ -64,7 +64,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -90,10 +90,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
+@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
  bool HasScheme(const std::u16string& input, const char* scheme) {
    std::string utf8_input(base::UTF16ToUTF8(input));
    url::Component view_source_scheme;
@@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
    return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
  }
  
-@@ -581,7 +586,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -568,7 +573,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
    // For the view-source and blob schemes, we should emphasize the host of the
    // URL qualified by the view-source or blob prefix.
    if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -93,7 +93,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -576,6 +576,10 @@ GURL FixupURLInternal(const std::string& text,
+@@ -607,6 +607,10 @@ GURL FixupURLInternal(const std::string& text,
      }
    }
  
@@ -102,12 +102,12 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 +  }
 +
    // We handle the file scheme separately.
-   if (scheme == url::kFileScheme)
+   if (scheme == url::kFileScheme) {
      return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -837,6 +837,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -951,6 +951,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
    RegisterPseudoScheme(url::kJavaScriptScheme);
    RegisterPseudoScheme(kViewSourceScheme);
    RegisterPseudoScheme(kGoogleChromeScheme);
@@ -118,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1012,6 +1012,8 @@ component("net") {
+@@ -1079,6 +1079,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -195,15 +195,15 @@ new file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -13,6 +13,7 @@
+@@ -15,6 +15,7 @@
- #include "base/metrics/histogram_macros.h"
+ #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"
+ #include "base/types/optional_util.h"
-@@ -47,6 +48,7 @@
+@@ -53,6 +54,7 @@
  #include "net/url_request/url_request_redirect_job.h"
  #include "url/gurl.h"
  #include "url/origin.h"
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  namespace net {
  
-@@ -591,6 +593,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
  
@@ -227,7 +227,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -48,6 +48,7 @@
+@@ -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"
@@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_job_factory.h"
  #include "url/url_constants.h"
-@@ -575,6 +576,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -601,6 +602,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }
@@ -247,8 +247,8 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 diff --git a/url/url_constants.h b/url/url_constants.h
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
-@@ -31,6 +31,7 @@ inline constexpr char kDataScheme[] = "data";
+@@ -34,6 +34,7 @@ inline constexpr char16_t kDataScheme16[] = u"data";
- inline constexpr char16_t kDataScheme16[] = u"data";
+ inline constexpr char kDrivefsScheme[] = "drivefs";
  inline constexpr char kFileScheme[] = "file";
  inline constexpr char16_t kFileScheme16[] = u"file";
 +inline constexpr char kTraceScheme[] = "trk";
@@ -258,7 +258,7 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -47,6 +47,7 @@ struct SchemeRegistry {
+@@ -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},
@@ -266,7 +266,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
        // Yes, file URLs can have a hostname, so file URLs should be handled as
        // "standard". File URLs never have a port as specified by the SchemeType
        // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -92,6 +93,7 @@ struct SchemeRegistry {
+@@ -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 +++++++
+ .../menu/bookmark_toolbar_menu_improved.xml    |  7 +++++++
- .../res/menu/bookmark_toolbar_menu_improved.xml   |  7 +++++++
+ .../browser/bookmarks/BookmarkToolbar.java     | 18 ++++++++++++++++++
- .../chrome/browser/bookmarks/BookmarkToolbar.java | 15 +++++++++++++++
+ .../android/strings/android_chrome_strings.grd |  3 +++
- .../ui/android/strings/android_chrome_strings.grd |  3 +++
+ 3 files changed, 28 insertions(+)
- 4 files changed, 32 insertions(+)
 
-diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
---- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
-+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
-@@ -23,6 +23,13 @@ found in the LICENSE file.
-             android:visible="false"
-             app:showAsAction="ifRoom"
-             app:iconTint="@color/default_icon_color_secondary_tint_list" />
-+        <item
-+            android:id="@+id/select_all_menu_id"
-+            android:icon="@drawable/ic_done_blue"
-+            android:title="@string/select_all_bookmarks"
-+            android:visible="true"
-+            app:showAsAction="ifRoom"
-+            app:iconTint="@color/default_icon_color_tint_list" />
-         <item
-             android:id="@+id/import_menu_id"
-             android:icon="@drawable/ic_folder_blue_24dp"
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
@@ -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>
+@@ -186,12 +188,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) {
+@@ -218,6 +224,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>
+@@ -235,6 +252,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
  
          getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
          getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
 +        getMenu().findItem(R.id.select_all_menu_id).setVisible(mCurrentFolder != null);
  
          // SelectableListToolbar will show/hide the entire group.
-         setSearchButtonVisible(mSearchButtonVisible);
+         setEditButtonVisible(mEditButtonVisible);
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -253,6 +253,9 @@ CHAR_LIMIT guidelines:
+@@ -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-subresource-adblocker.patch

@@ -22,37 +22,36 @@ 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.cc        |  28 ++
  chrome/browser/browser_process_impl.h         |   2 +
  chrome/browser/chrome_browser_main.cc         |   3 +
  chrome/browser/flags/BUILD.gn                 |   3 +
  .../flags/android/adblock_native_gateway.cc   |  31 ++
  .../browser/flags/AdBlockNativeGateway.java   |  30 ++
- .../net/system_network_context_manager.cc     |   8 +
+ .../net/system_network_context_manager.cc     |   4 +
- .../sessions/session_restore_android.cc       |   6 +-
+ .../sessions/session_restore_android.cc       |   7 +-
  .../strings/android_chrome_strings.grd        |  14 +
  chrome/common/pref_names.h                    |   5 +
  .../strings/android/site_settings.grdp        |   3 +
- components/component_updater/BUILD.gn         |   7 +
+ components/component_updater/BUILD.gn         |   8 +
  .../adblock_updater_service.cc                | 281 ++++++++++++++++++
  .../adblock_updater_service.h                 | 103 +++++++
- .../download_filters_task.cc                  | 239 +++++++++++++++
+ .../download_filters_task.cc                  | 250 ++++++++++++++++
  .../component_updater/download_filters_task.h | 129 ++++++++
  ...ent_subresource_filter_throttle_manager.cc |  15 +
  ...tent_subresource_filter_throttle_manager.h |   2 +
- .../content/shared/browser/ruleset_service.cc |  46 ++-
+ .../content/shared/browser/ruleset_service.cc |  47 ++-
  .../content/shared/browser/ruleset_service.h  |   8 +-
  .../unindexed_ruleset_stream_generator.cc     |   3 +
  .../core/browser/ruleset_version.h            |   4 +
- .../browser/subresource_filter_features.cc    | 116 +-------
+ .../browser/subresource_filter_features.cc    | 114 +------
- .../core/browser/verified_ruleset_dealer.cc   |   3 +
+ .../core/browser/verified_ruleset_dealer.cc   |   4 +
  .../core/common/indexed_ruleset.cc            |   5 +-
- .../Bromite-subresource-adblocker.inc         |   3 +
+ 39 files changed, 1271 insertions(+), 129 deletions(-)
- 40 files changed, 1259 insertions(+), 126 deletions(-)
  create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
  create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -63,13 +62,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  create mode 100644 components/component_updater/adblock_updater_service.h
  create mode 100644 components/component_updater/download_filters_task.cc
  create mode 100644 components/component_updater/download_filters_task.h
- create mode 100644 cromite_flags/third_party/blink/common/features_cc/Bromite-subresource-adblocker.inc
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -338,6 +338,7 @@ if (current_toolchain == default_toolchain) {
+@@ -322,6 +322,7 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/android/modules/cablev2_authenticator/public:java",
+       "//chrome/android/features/tab_ui/public:ui_java_resources",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
 +      "//chrome/browser/endpoint_fetcher:java",
@@ -79,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
-@@ -427,6 +427,7 @@ chrome_java_resources = [
+@@ -433,6 +433,7 @@ chrome_java_resources = [
-   "java/res/layout/account_chooser_dialog_title.xml",
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
+   "java/res/layout/app_history_filter.xml",
 +  "java/res/layout/adblock_editor.xml",
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -630,6 +631,7 @@ chrome_java_resources = [
+@@ -621,6 +622,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,8 +96,8 @@ 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
-@@ -973,6 +973,8 @@ chrome_java_sources = [
+@@ -928,6 +928,8 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
+   "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
 +  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
@@ -182,7 +180,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -245,6 +245,24 @@ found in the LICENSE file.
+@@ -256,6 +256,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -210,13 +208,13 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -19,6 +19,10 @@ found in the LICENSE file.
+@@ -22,6 +22,10 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
 +    <string name="adblock_on">Autoupdate enabled</string>
 +    <string name="adblock_off">Autoupdate disabled</string>
-+    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>
++    <string name="adblock_help_url">https://github.com/uazo/cromite/blob/master/docs/BROMITE_LEGACY_ADBLOCK.md</string>
 +
      <string name="proxy_title">Proxy configuration</string>
      <string name="proxy_url">chrome://proxy</string>
@@ -254,10 +252,10 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -83,6 +83,11 @@ found in the LICENSE file.
+@@ -120,6 +120,11 @@ for the previous order (main_preferences_legacy). -->
-         android:key="safety_hub"
+         android:key="toolbar_shortcut"
-         android:order="14"
+         android:order="21"
-         android:title="@string/prefs_safety_check"/>
+         android:title="@string/toolbar_shortcut"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
 +        android:key="adblock"
@@ -265,7 +263,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 +        android:title="@string/prefs_adblock"/>
      <Preference
          android:key="notifications"
-         android:order="15"
+         android:order="22"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
 new file mode 100644
 --- /dev/null
@@ -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
-@@ -862,7 +862,7 @@ public class TabModelImpl extends TabModelJniBridge {
+@@ -924,9 +924,7 @@ public class TabModelImpl extends TabModelJniBridge {
-     protected boolean createTabWithWebContents(
+                 .createTabWithWebContents(
-             Tab parent, Profile profile, WebContents webContents) {
+                         parent,
-         return getTabCreator(profile.isOffTheRecord())
+                         webContents,
--                .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_RECENT_TABS);
+-                        select
-+                .createTabWithWebContents(parent, webContents, TabLaunchType.FROM_LINK);
+-                                ? 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
-@@ -15173,6 +15173,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -16566,6 +16566,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 {
+ namespace gcm {
- class EventRouterForwarder;
+ class GCMDriver;
  }
-@@ -253,6 +258,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
-@@ -1183,6 +1183,27 @@ BrowserProcessImpl::component_updater() {
+@@ -1220,6 +1220,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -526,6 +526,13 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 +  std::unique_ptr<component_updater::UpdateScheduler> scheduler =
 +      std::make_unique<component_updater::TimerUpdateScheduler>();
 +
++  auto adblock_updater_url =
++    local_state()->GetString(prefs::kAdBlockFiltersURL);
++  if (base::StartsWith(adblock_updater_url,
++        "https://www.bromite.org", base::CompareCase::INSENSITIVE_ASCII)) {
++    local_state()->SetString(prefs::kAdBlockFiltersURL, "about:blank");
++  }
++
 +  adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
 +          g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
 +          std::move(scheduler),
@@ -542,7 +549,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
-@@ -212,6 +212,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess,
  #endif
  
    component_updater::ComponentUpdateService* component_updater() override;
@@ -550,7 +557,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
    MediaFileSystemRegistry* media_file_system_registry() override;
    WebRtcLogUploader* webrtc_log_uploader() override;
    network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -413,6 +414,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -421,6 +422,7 @@ class BrowserProcessImpl : public BrowserProcess,
    // to concerns over integrity of data shared between profiles,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -561,7 +568,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -455,6 +455,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -468,6 +468,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -582,7 +589,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
-@@ -33,6 +34,7 @@ android_library("java") {
+@@ -47,6 +48,7 @@ java_bromite_impl("java_cromite_cached_flags") {
  generate_jni("jni_headers") {
    sources = [ "android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java" ]
    sources += [
@@ -590,7 +597,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
    ]
-@@ -47,6 +49,7 @@ static_library("flags_android") {
+@@ -61,6 +63,7 @@ static_library("flags_android") {
      "android/chrome_session_state.cc",
      "android/chrome_session_state.h",
    ]
@@ -672,17 +679,13 @@ new file mode 100755
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -640,6 +640,14 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -651,6 +651,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
- void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
+   DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
  
-+#if BUILDFLAG(IS_ANDROID)
-+  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, true);
-+#else
 +  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);
-+#endif
 +  registry->RegisterStringPref(prefs::kAdBlockFiltersURL,
-+    "https://www.bromite.org/filters/filters.dat");
++    "about:blank");
 +
    // Static auth params
    registry->RegisterStringPref(prefs::kAuthSchemes,
@@ -690,14 +693,15 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
 --- a/chrome/browser/sessions/session_restore_android.cc
 +++ b/chrome/browser/sessions/session_restore_android.cc
-@@ -56,8 +56,10 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
+@@ -58,8 +58,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
    DCHECK(current_tab);
    // If swapped, return the current tab's most up-to-date web contents.
    if (disposition == WindowOpenDisposition::CURRENT_TAB) {
 -    current_tab->SwapWebContents(std::move(new_web_contents), false, false);
 -    return current_tab->web_contents();
 +    int active_tab_index = tab_model->GetActiveIndex();
-+    tab_model->CreateTab(current_tab, new_web_contents.release());
++    tab_model->CreateTab(current_tab, new_web_contents.release(),
++      disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
 +    tab_model->CloseTabAt(active_tab_index);
 +    return raw_new_web_contents;
    }
@@ -706,8 +710,8 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -225,6 +225,20 @@ CHAR_LIMIT guidelines:
+@@ -218,6 +218,20 @@ CHAR_LIMIT guidelines:
-         Control your data &amp; accounts
+         Advanced
        </message>
  
 +      <!-- AdBlock settings -->
@@ -730,7 +734,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2688,6 +2688,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2846,6 +2846,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -745,7 +749,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -368,6 +368,9 @@
+@@ -373,6 +373,9 @@
    <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
      This site shows intrusive or misleading ads
    </message>
@@ -758,7 +762,7 @@ diff --git a/components/browser_ui/strings/android/site_settings.grdp b/componen
 diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
 --- a/components/component_updater/BUILD.gn
 +++ b/components/component_updater/BUILD.gn
-@@ -16,6 +16,12 @@ static_library("component_updater") {
+@@ -19,6 +19,12 @@ static_library("component_updater") {
      "component_installer.h",
      "component_updater_command_line_config_policy.cc",
      "component_updater_command_line_config_policy.h",
@@ -771,7 +775,7 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
      "component_updater_service.cc",
      "component_updater_service.h",
      "component_updater_service_internal.h",
-@@ -48,6 +54,7 @@ static_library("component_updater") {
+@@ -49,9 +55,11 @@ static_library("component_updater") {
      "//components/update_client",
      "//components/version_info",
      "//net",
@@ -779,6 +783,10 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
      "//third_party/boringssl",
      "//ui/base",
      "//url",
++    "//content/common:buildflags"
+   ]
+ }
+ 
 diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
 new file mode 100644
 --- /dev/null
@@ -1177,7 +1185,7 @@ diff --git a/components/component_updater/download_filters_task.cc b/components/
 new file mode 100644
 --- /dev/null
 +++ b/components/component_updater/download_filters_task.cc
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,250 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1347,10 +1355,21 @@ new file mode 100644
 +  final_url_ = final_url;
 +  response_code_ = response_head.headers ? response_head.headers->response_code() : -1;
 +
-+  if (!response_head.headers->GetLastModifiedValue(&last_modified_))
++  std::optional<base::Time> last_modified_value =
-+    LOG(WARNING) << "DownloadFiltersTask: fetching URL '" << final_url.spec() << "' with method " << (min_last_modified_.is_null() ? "GET" : "HEAD") << " (no Last-Modified header)";
++          response_head.headers->GetLastModifiedValue();
-+  else
++  if (last_modified_value) {
-+    LOG(INFO) << "DownloadFiltersTask: fetching URL '" << final_url.spec() << "' with method " << (min_last_modified_.is_null() ? "GET" : "HEAD");
++    last_modified_ = last_modified_value.value();
++    LOG(INFO) << "DownloadFiltersTask: fetching URL '"
++              << final_url.spec()
++              << "' with method "
++              << (min_last_modified_.is_null() ? "GET" : "HEAD");
++  } else {
++    LOG(WARNING) << "DownloadFiltersTask: fetching URL '"
++                 << final_url.spec()
++                 << "' with method "
++                 << (min_last_modified_.is_null() ? "GET" : "HEAD")
++                 << " (no Last-Modified header)";
++  }
 +}
 +
 +void DownloadFiltersTask::OnDownloadComplete(base::FilePath file_path) {
@@ -1554,7 +1573,7 @@ new file mode 100644
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -15,6 +15,9 @@
+@@ -18,6 +18,9 @@
  #include "base/strings/stringprintf.h"
  #include "base/trace_event/trace_event.h"
  #include "base/trace_event/traced_value.h"
@@ -1563,8 +1582,8 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
  #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
  #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
- #include "components/subresource_filter/content/browser/page_load_statistics.h"
+ #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
-@@ -151,6 +154,7 @@ ContentSubresourceFilterThrottleManager::
+@@ -112,6 +115,7 @@ ContentSubresourceFilterThrottleManager::
        profile_interaction_manager_(
            std::make_unique<subresource_filter::ProfileInteractionManager>(
                profile_context)),
@@ -1572,7 +1591,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
        web_contents_helper_(web_contents_helper) {}
  
  ContentSubresourceFilterThrottleManager::
-@@ -675,6 +679,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -672,6 +676,17 @@ ContentSubresourceFilterThrottleManager::
        throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                  ad_tagging_state);
      }
@@ -1593,7 +1612,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
+@@ -414,6 +414,8 @@ class ContentSubresourceFilterThrottleManager
  
    std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
  
@@ -1605,19 +1624,22 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.cc b/components/subresource_filter/content/shared/browser/ruleset_service.cc
 --- a/components/subresource_filter/content/shared/browser/ruleset_service.cc
 +++ b/components/subresource_filter/content/shared/browser/ruleset_service.cc
-@@ -47,9 +47,7 @@ namespace {
+@@ -51,12 +51,7 @@ namespace {
- 
  void RecordIndexAndWriteRulesetResult(
+     std::string_view uma_tag,
      RulesetService::IndexAndWriteRulesetResult result) {
--  UMA_HISTOGRAM_ENUMERATION(
+-  base::UmaHistogramEnumeration(
--      "SubresourceFilter.WriteRuleset.Result", static_cast<int>(result),
+-      base::StrCat({uma_tag, ".WriteRuleset.Result"}), result,
--      static_cast<int>(RulesetService::IndexAndWriteRulesetResult::MAX));
+-      static_cast<RulesetService::IndexAndWriteRulesetResult>(
+-          static_cast<int>(
+-              RulesetService::IndexAndWriteRulesetResult::kMaxValue) +
+-          1));
 +  VLOG(1) << "SubresourceFilter.WriteRuleset.Result: " << static_cast<int>(result);
  }
  
  // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -228,10 +226,13 @@ RulesetService::RulesetService(
+@@ -237,10 +232,13 @@ RulesetService::RulesetService(
- RulesetService::~RulesetService() {}
+ RulesetService::~RulesetService() = default;
  
  void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
 -    const UnindexedRulesetInfo& unindexed_ruleset_info) {
@@ -1632,7 +1654,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
    // Trying to store a ruleset with the same version for a second time would
    // not only be futile, but would fail on Windows due to "File System
    // Tunneling" as long as the previously stored copy of the rules is still
-@@ -241,13 +242,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -250,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
    if (most_recently_indexed_version.IsCurrentFormatVersion() &&
        most_recently_indexed_version.content_version ==
            unindexed_ruleset_info.content_version) {
@@ -1649,7 +1671,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
      return;
    }
  
-@@ -267,6 +271,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -276,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
      const RulesetConfig& config,
      const base::FilePath& indexed_ruleset_base_dir,
      const UnindexedRulesetInfo& unindexed_ruleset_info) {
@@ -1673,28 +1695,29 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
    base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                  base::BlockingType::MAY_BLOCK);
  
-@@ -274,6 +295,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -283,6 +301,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
        unindexed_ruleset_info);
  
    if (!unindexed_ruleset_stream_generator.ruleset_stream()) {
 +    LOG(WARNING) << "RulesetService: failed to open: " << unindexed_ruleset_info.ruleset_path;
      RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_OPENING_UNINDEXED_RULESET);
+         config.uma_tag,
-     return IndexedRulesetVersion(config.filter_tag);
+         IndexAndWriteRulesetResult::kFailedOpeningUnindexedRuleset);
-@@ -287,6 +309,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -297,6 +316,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
            indexed_ruleset_base_dir, indexed_version);
  
    if (!base::CreateDirectory(indexed_ruleset_version_dir)) {
 +    LOG(WARNING) << "RulesetService: failed to create version dir: " << indexed_ruleset_version_dir;
      RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_CREATING_VERSION_DIR);
+         config.uma_tag, IndexAndWriteRulesetResult::kFailedCreatingVersionDir);
      return IndexedRulesetVersion(config.filter_tag);
-@@ -294,12 +317,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -304,13 +324,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
  
    SentinelFile sentinel_file(indexed_ruleset_version_dir);
    if (sentinel_file.IsPresent()) {
 -    RecordIndexAndWriteRulesetResult(
--        IndexAndWriteRulesetResult::ABORTED_BECAUSE_SENTINEL_FILE_PRESENT);
+-        config.uma_tag,
+-        IndexAndWriteRulesetResult::kAbortedBecauseSentinelFilePresent);
 -    return IndexedRulesetVersion(config.filter_tag);
 +    LOG(WARNING) << "RulesetService: sentinel file is present in " << indexed_ruleset_version_dir;
    }
@@ -1702,34 +1725,33 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
    if (!sentinel_file.Create()) {
 +    LOG(WARNING) << "RulesetService: cannot create sentinel file in " << indexed_ruleset_version_dir;
      RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_CREATING_SENTINEL_FILE);
+         config.uma_tag,
-     return IndexedRulesetVersion(config.filter_tag);
+         IndexAndWriteRulesetResult::kFailedCreatingSentinelFile);
-@@ -312,6 +334,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -325,6 +343,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
- 
    RulesetIndexer indexer;
-   if (!(*g_index_ruleset_func)(&unindexed_ruleset_stream_generator, &indexer)) {
+   if (!(*g_index_ruleset_func)(config, &unindexed_ruleset_stream_generator,
+                                &indexer)) {
 +    LOG(WARNING) << "RulesetService: failed parsing.";
      RecordIndexAndWriteRulesetResult(
-         IndexAndWriteRulesetResult::FAILED_PARSING_UNINDEXED_RULESET);
+         config.uma_tag,
-     return IndexedRulesetVersion(config.filter_tag);
+         IndexAndWriteRulesetResult::kFailedParsingUnindexedRuleset);
-@@ -329,8 +352,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -345,9 +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::kSuccess) {
-+  if (result != IndexAndWriteRulesetResult::SUCCESS) {
 +    LOG(INFO) << "RulesetService: failed to index.";
      return IndexedRulesetVersion(config.filter_tag);
-+  }
+   }
-+
-+  LOG(INFO) << "RulesetService: successful parsing.";
  
-   DCHECK(indexed_version.IsValid());
++  LOG(INFO) << "RulesetService: successful parsing.";
++
+   CHECK(indexed_version.IsValid(), base::NotFatalUntil::M129);
    return indexed_version;
-@@ -452,6 +479,7 @@ void RulesetService::IndexAndStoreRuleset(
+ }
+@@ -470,6 +492,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;
@@ -1737,7 +1759,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.h b/components/subresource_filter/content/shared/browser/ruleset_service.h
 --- a/components/subresource_filter/content/shared/browser/ruleset_service.h
 +++ b/components/subresource_filter/content/shared/browser/ruleset_service.h
-@@ -185,7 +185,7 @@ class RulesetService {
+@@ -183,7 +183,7 @@ class RulesetService {
    //
    // Virtual so that it can be mocked out in tests.
    virtual void IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1762,7 +1784,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 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
-@@ -12,6 +12,7 @@
+@@ -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"
@@ -1770,7 +1792,7 @@ diff --git a/components/subresource_filter/content/shared/browser/unindexed_rule
  
  namespace subresource_filter {
  
-@@ -46,6 +47,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
+@@ -49,6 +50,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
  
    ruleset_size_ = unindexed_ruleset_file.GetLength();
  
@@ -1796,7 +1818,7 @@ diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/comp
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,72 +55,7 @@ class CommaSeparatedStrings {
+@@ -55,71 +55,8 @@ class CommaSeparatedStrings {
    const std::vector<std::string_view> pieces_;
  };
  
@@ -1811,8 +1833,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  return value;
 -}
 -
--mojom::ActivationLevel ParseActivationLevel(
+-mojom::ActivationLevel ParseActivationLevel(std::string_view activation_level) {
--    const std::string_view activation_level) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_level,
 -                                       kActivationLevelEnabled))
 -    return mojom::ActivationLevel::kEnabled;
@@ -1822,7 +1843,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  return mojom::ActivationLevel::kDisabled;
 -}
 -
--ActivationScope ParseActivationScope(const std::string_view activation_scope) {
+-ActivationScope ParseActivationScope(std::string_view activation_scope) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_scope,
 -                                       kActivationScopeAllSites))
 -    return ActivationScope::ALL_SITES;
@@ -1858,19 +1879,19 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  return value < 1 ? value : 1;
 -}
 -
--int ParseInt(const std::string_view value) {
+-int ParseInt(std::string_view value) {
 -  int result = 0;
 -  base::StringToInt(value, &result);
 -  return result;
 -}
--
+ 
 -std::vector<Configuration> FillEnabledPresetConfigurations(
 -    std::map<std::string, std::string>* params) {
 +std::vector<Configuration> FillEnabledPresetConfigurations() {
    // If ad tagging is enabled, turn on the dryrun automatically.
    bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
    const struct {
-@@ -128,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -127,23 +64,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
      bool enabled_by_default;
      Configuration (*factory_method)();
    } kAvailablePresetConfigurations[] = {
@@ -1896,7 +1917,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
        enabled_configurations.push_back(available_preset.factory_method());
      }
    }
-@@ -152,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -151,46 +81,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
    return enabled_configurations;
  }
  
@@ -1947,7 +1968,15 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
 --- a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
 +++ b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
-@@ -38,6 +38,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
+@@ -11,6 +11,7 @@
+ #include "base/functional/bind.h"
+ #include "base/functional/callback_helpers.h"
+ #include "base/location.h"
++#include "base/logging.h"
+ #include "base/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());
@@ -1965,10 +1994,10 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
  #include "base/check.h"
  #include "base/hash/hash.h"
 +#include "base/logging.h"
- #include "base/metrics/histogram_macros.h"
+ #include "base/metrics/histogram_functions.h"
- #include "base/trace_event/trace_event.h"
+ #include "base/not_fatal_until.h"
- #include "components/subresource_filter/core/common/first_party_origin.h"
+ #include "base/strings/strcat.h"
-@@ -36,7 +37,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
+@@ -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());
@@ -1979,12 +2008,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
+@@ -226,6 +226,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
+@@ -1310,6 +1310,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+ 
+   void UpdateAccessibleNameForRootView();
+ 
++  // 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.
+@@ -1348,13 +1361,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;
+@@ -1365,11 +1371,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   friend class ui_devtools::BubbleLocking;
+   friend void DisableActivationChangeHandlingForTests();
+ 
+-  // Sets/gets the type of disabling widget activation change handling.
+-  static void SetDisableActivationChangeHandling(
+-      DisableActivationChangeHandlingType new_type) {
+-    g_disable_activation_change_handling_ = new_type;
+-  }
+   static DisableActivationChangeHandlingType
+   GetDisableActivationChangeHandling() {
+     return g_disable_activation_change_handling_;
+--

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

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

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

@@ -13,45 +13,49 @@ 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 +++
+ chrome/app/extensions_strings.grdp            |  6 ++
- .../developer_private_api.cc                  | 37 ++++++++++++-
+ .../developer_private_api.cc                  | 38 +++++++++++-
- .../developer_private/developer_private_api.h |  3 ++
+ .../developer_private/developer_private_api.h |  3 +
- .../webstore_private/webstore_private_api.cc  | 15 +++++-
+ .../webstore_private/webstore_private_api.cc  | 15 ++++-
- chrome/browser/extensions/cws_info_service.cc |  1 +
+ .../extensions/cws_info_service_factory.cc    |  3 +-
+ .../extensions/extension_management.cc        |  1 +
+ .../extension_safety_check_utils.cc           |  3 +-
+ .../browser/extensions/extension_service.cc   |  4 +-
  .../extensions/extension_system_impl.cc       |  2 +
  .../chrome_extension_downloader_factory.cc    |  1 -
- .../extensions/updater/extension_updater.cc   | 40 ++++++++------
+ .../extensions/updater/extension_updater.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 +
+ .../resources/extensions/manager.html.ts      |  1 +
- .../browser/resources/extensions/manager.ts   |  7 +++
+ .../browser/resources/extensions/manager.ts   |  5 ++
  .../browser/resources/extensions/service.ts   |  5 ++
- .../browser/resources/extensions/toolbar.html | 12 +++++
+ .../browser/resources/extensions/toolbar.css  |  5 ++
- .../browser/resources/extensions/toolbar.ts   | 20 +++++++
+ .../resources/extensions/toolbar.html.ts      |  7 +++
+ .../browser/resources/extensions/toolbar.ts   | 17 ++++++
  .../resources/webstore_app/manifest.json      |  7 +--
  .../ui/webui/extensions/extensions_ui.cc      |  8 +++
- .../chrome_update_query_params_delegate.cc    | 13 ++---
+ .../chrome_update_query_params_delegate.cc    | 13 ++--
  .../extensions/api/developer_private.idl      |  2 +
- .../update_client/update_query_params.cc      |  7 ++-
+ .../update_client/update_query_params.cc      |  7 +--
- .../about_flags_cc/Webstore-protection.inc    | 19 +++++++
+ .../about_flags_cc/Webstore-protection.inc    | 19 ++++++
- .../browser/api/management/management_api.cc  | 50 +++++++++++------
+ .../browser/api/management/management_api.cc  | 60 ++++++++++++-------
- .../browser/updater/extension_downloader.cc   | 53 +++++++------------
+ .../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       | 14 +++++
  extensions/common/extension_features.h        |  4 ++
- .../definitions/developer_private.d.ts        |  4 +-
+ .../definitions/developer_private.d.ts        |  2 +
- 30 files changed, 252 insertions(+), 98 deletions(-)
+ 34 files changed, 254 insertions(+), 109 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
 
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -76,6 +76,12 @@
+@@ -88,6 +88,12 @@
-   <message name="IDS_EXTENSIONS_DEVELOPER_MODE" desc="The text displayed next to the checkbox to toggle developer mode in the extensions page.">
+   <message name="IDS_EXTENSIONS_DISABLED_UNSUPPORTED_DEVELOPER_MODE_TOAST" desc="Text displayed in a toast popup message when extensions are disabled due to unsupported developer mode.">
-     Developer mode
+     Developer Mode Off. Some extensions were disabled.
    </message>
 +  <message name="IDS_EXTENSIONS_EXTENSION_UPDATE_ENABLED" desc="The text displayed next to the checkbox to toggle extension auto update.">
 +    Enable Auto-Update
@@ -65,7 +69,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 @@
+@@ -136,6 +136,12 @@
  #include "url/gurl.h"
  #include "url/origin.h"
  
@@ -78,10 +82,11 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  namespace extensions {
  
  namespace developer = api::developer_private;
-@@ -466,9 +472,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
+@@ -490,10 +496,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
-   info->can_load_unpacked =
+   info->is_mv2_deprecation_notice_dismissed =
-       ExtensionManagementFactory::GetForBrowserContext(profile)
+       ManifestV2ExperimentManager::Get(profile)
-           ->HasAllowlistedExtension();
+           ->DidUserAcknowledgeNoticeGlobally();
+-
 +  info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
    return info;
  }
@@ -111,7 +116,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  template <>
  void BrowserContextKeyedAPIFactory<
      DeveloperPrivateAPI>::DeclareFactoryDependencies() {
-@@ -898,6 +927,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -934,6 +962,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
      ExtensionUpdater::CheckParams params;
      params.fetch_priority = DownloadFetchPriority::kForeground;
      params.install_immediately = true;
@@ -119,7 +124,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));
-@@ -1038,7 +1068,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -1068,7 +1097,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
  
    const developer::ProfileConfigurationUpdate& update = params->update;
  
@@ -127,9 +132,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 +  if (update.in_developer_mode.has_value() && update.in_developer_mode) {
      Profile* profile = Profile::FromBrowserContext(browser_context());
      CHECK(profile);
-     if (supervised_user::AreExtensionsPermissionsEnabled(
+     if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -1048,6 +1078,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -1082,6 +1111,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
-     util::SetDeveloperModeForProfile(profile, *update.in_developer_mode);
+         ->MarkNoticeAsAcknowledgedGlobally();
    }
  
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
@@ -143,7 +148,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,23 +161,24 @@ 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
-@@ -63,6 +63,7 @@
+@@ -66,6 +66,7 @@
- #include "extensions/browser/extension_system.h"
  #include "extensions/browser/extension_util.h"
+ #include "extensions/browser/extensions_browser_client.h"
  #include "extensions/common/extension.h"
 +#include "extensions/common/extension_features.h"
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -220,12 +221,16 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -219,6 +220,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
  // there was previously stored data, or an empty string otherwise. The Set will
  // overwrite any previous login.
  std::string GetWebstoreLogin(Profile* profile) {
 +  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();
+   }
+@@ -226,11 +229,15 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -181,8 +187,6 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    profile->GetPrefs()->SetString(kWebstoreLogin, login);
  }
  
-@@ -235,6 +240,8 @@ void RecordWebstoreExtensionInstallResult(bool success) {
- 
  api::webstore_private::ExtensionInstallStatus
  ConvertExtensionInstallStatusForAPI(ExtensionInstallStatus status) {
 +  if (!base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore))
@@ -190,7 +194,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    switch (status) {
      case kCanRequest:
        return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1150,7 +1157,8 @@ ExtensionFunction::ResponseAction
+@@ -1153,7 +1160,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -200,7 +204,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1245,11 +1253,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1248,11 +1256,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -216,17 +220,64 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateGetExtensionStatusFunction::
-diff --git a/chrome/browser/extensions/cws_info_service.cc b/chrome/browser/extensions/cws_info_service.cc
+diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/browser/extensions/cws_info_service_factory.cc
---- a/chrome/browser/extensions/cws_info_service.cc
+--- a/chrome/browser/extensions/cws_info_service_factory.cc
-+++ b/chrome/browser/extensions/cws_info_service.cc
++++ b/chrome/browser/extensions/cws_info_service_factory.cc
-@@ -160,6 +160,7 @@ namespace extensions {
+@@ -47,7 +47,8 @@ CWSInfoServiceFactory::CWSInfoServiceFactory()
- BASE_FEATURE(kCWSInfoService,
+ std::unique_ptr<KeyedService>
-              "CWSInfoService",
+ CWSInfoServiceFactory::BuildServiceInstanceForBrowserContext(
-              base::FEATURE_ENABLED_BY_DEFAULT);
+     content::BrowserContext* context) const {
-+SET_CROMITE_FEATURE_DISABLED(kCWSInfoService);
+-  return std::make_unique<CWSInfoService>(Profile::FromBrowserContext(context));
++  // Disallow periodic retrieval of extensions metadata from the Chrome Web Store
++  return nullptr;
+ }
  
- // Increase the frequency of periodic retrieval of extensions metadata from
+ bool CWSInfoServiceFactory::ServiceIsCreatedWithBrowserContext() const {
- // CWS. This feature is used only for testing purposes.
+diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
+--- a/chrome/browser/extensions/extension_management.cc
++++ b/chrome/browser/extensions/extension_management.cc
+@@ -379,6 +379,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+ 
+ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
+     const Extension* extension) {
++  if ((true)) return true;
+   // This policy only applies to extensions that update from CWS.
+   if (!UpdatesFromWebstore(*extension)) {
+     return true;
+diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/browser/extensions/extension_safety_check_utils.cc
+--- a/chrome/browser/extensions/extension_safety_check_utils.cc
++++ b/chrome/browser/extensions/extension_safety_check_utils.cc
+@@ -240,8 +240,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
+   developer::SafetyCheckWarningReason acknowledged_reason =
+       GetPrefAcknowledgeSafetyCheckWarningReason(extension,
+                                                  ExtensionPrefs::Get(profile));
+-  std::optional<CWSInfoService::CWSInfo> cws_info =
+-      cws_info_service->GetCWSInfo(extension);
++  std::optional<CWSInfoService::CWSInfo> cws_info;
+   bool valid_cws_info = cws_info.has_value() && cws_info->is_present;
+   if (unpublished_only) {
+     if (valid_cws_info && cws_info->unpublished_long_ago) {
+diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
+--- a/chrome/browser/extensions/extension_service.cc
++++ b/chrome/browser/extensions/extension_service.cc
+@@ -443,8 +443,6 @@ ExtensionService::ExtensionService(
+ 
+   UpgradeDetector::GetInstance()->AddObserver(this);
+ 
+-  cws_info_service_observation_.Observe(CWSInfoService::Get(profile_));
+-
+   ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
+ 
+   // Set up the ExtensionUpdater.
+@@ -1900,7 +1898,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+   // unpublished extensions should not be enabled. This update allows
+   // unpublished extensions to be disabled sooner rather than waiting till the
+   // next regularly scheduled fetch.
+-  if (profile_->GetPrefs()->GetInteger(
++  if (((false)) && profile_->GetPrefs()->GetInteger(
+           pref_names::kExtensionUnpublishedAvailability) !=
+       kAllowUnpublishedExtensions) {
+     CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo();
 diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -249,7 +300,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 +311,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto
 diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
 --- a/chrome/browser/extensions/updater/extension_updater.cc
 +++ b/chrome/browser/extensions/updater/extension_updater.cc
-@@ -44,6 +44,7 @@
+@@ -47,6 +47,7 @@
  #include "extensions/browser/updater/extension_update_data.h"
  #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
@@ -268,7 +319,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  #include "extensions/common/extension_set.h"
  #include "extensions/common/extension_updater_uma.h"
  #include "extensions/common/extension_urls.h"
-@@ -198,6 +199,10 @@ void ExtensionUpdater::Start() {
+@@ -201,6 +202,10 @@ void ExtensionUpdater::Start() {
    DCHECK(!weak_ptr_factory_.HasWeakPtrs());
    DCHECK(registry_);
    alive_ = true;
@@ -279,7 +330,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    // Check soon, and set up the first delayed check.
    if (!g_skip_scheduled_checks_for_tests) {
      if (g_should_immediately_update)
-@@ -330,7 +335,8 @@ void ExtensionUpdater::AddToDownloader(
+@@ -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 +340,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
-@@ -344,7 +350,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)) {
+@@ -386,6 +392,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
-@@ -382,6 +388,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
  }
  
  void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -311,7 +362,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    if (params.ids.empty()) {
      // Checking all extensions. Cancel pending DoCheckSoon() call if there's
      // one, as it would be redundant.
-@@ -390,7 +402,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -394,7 +406,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
  
    int request_id = next_request_id_++;
  
@@ -320,25 +371,25 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    if (params.ids.empty())
      NotifyStarted();
  
-@@ -462,7 +474,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -467,7 +479,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-                                      << " is not a corrupt reinstall";
+         update_check_params.update_info[pending_id] =
-         update_check_params.update_info[pending_id] = ExtensionUpdateData();
+             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
-@@ -472,7 +484,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;
+@@ -500,6 +512,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-         if (is_corrupt_reinstall) {
-@@ -493,6 +505,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
            LOG(WARNING) << "Corrupt extension with id " << pending_id
                         << " will be reinstalled with ExtensionDownloader.";
          }
@@ -347,7 +398,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        } else {
          InstallStageTracker::Get(profile_)->ReportFailure(
              pending_id,
-@@ -505,13 +519,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -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 +412,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 {
-@@ -519,7 +526,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)) {
-@@ -660,7 +667,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -667,7 +674,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
        file.extension_id, InstallStageTracker::Stage::INSTALLING);
    UpdatePingData(file.extension_id, ping);
  
@@ -379,7 +430,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  
    FetchedCRXFile fetched(file, file_ownership_passed, request_ids,
                           std::move(callback));
-@@ -671,6 +678,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -678,6 +685,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
  
  bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                 DownloadPingData* ping_data) {
@@ -387,7 +438,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    DCHECK(alive_);
    ping_data->rollcall_days =
        CalculatePingDaysForExtension(extension_prefs_->LastPingDay(id));
-@@ -769,7 +777,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -790,7 +798,7 @@ bool ExtensionUpdater::CanUseUpdateService(
  void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
    std::set<int> request_ids;
  
@@ -396,7 +447,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
            << crx_file.info.path.value();
  
    // The ExtensionService is now responsible for cleaning up the temp file
-@@ -878,7 +886,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+@@ -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 +459,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
 --- a/chrome/browser/extensions/updater/extension_updater.h
 +++ b/chrome/browser/extensions/updater/extension_updater.h
-@@ -81,6 +81,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -82,6 +82,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
      // right away.
      bool install_immediately = false;
  
@@ -417,7 +468,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
      // An extension update check can be originated by a user or by a scheduled
      // task. When the value of |fetch_priority| is FOREGROUND, the update
      // request was initiated by a user.
-@@ -328,6 +330,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -333,6 +335,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
    base::TimeDelta frequency_;
    bool will_check_soon_ = false;
  
@@ -441,53 +492,51 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows
 diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -624,7 +624,7 @@ void WebstoreInstaller::StartDownload(
+@@ -625,7 +625,7 @@ void WebstoreInstaller::StartDownload(
-       download_url_, render_process_host_id, render_frame_host->GetRoutingID(),
        traffic_annotation));
    params->set_file_path(file);
+   params->set_initiator(render_frame_host->GetLastCommittedOrigin());
 -  if (controller.GetVisibleEntry()) {
 +  if ((false) && controller.GetVisibleEntry()) {
      content::Referrer referrer = content::Referrer::SanitizeForRequest(
          download_url_,
          content::Referrer(controller.GetVisibleEntry()->GetURL(),
-diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/resources/extensions/manager.html
+diff --git a/chrome/browser/resources/extensions/manager.html.ts b/chrome/browser/resources/extensions/manager.html.ts
---- a/chrome/browser/resources/extensions/manager.html
+--- a/chrome/browser/resources/extensions/manager.html.ts
-+++ b/chrome/browser/resources/extensions/manager.html
++++ b/chrome/browser/resources/extensions/manager.html.ts
-@@ -64,6 +64,7 @@
+@@ -12,6 +12,7 @@ export function getHtml(this: ExtensionsManagerElement) {
- <extensions-drop-overlay drag-enabled="[[inDevMode]]">
+ <extensions-drop-overlay ?drag-enabled="${this.inDevMode}">
  </extensions-drop-overlay>
- <extensions-toolbar id="toolbar" in-dev-mode="[[inDevMode]]"
+ <extensions-toolbar id="toolbar" ?in-dev-mode="${this.inDevMode}"
-+    is-ext-update-enabled="[[isExtUpdateEnabled]]"
++    ?is-ext-update-enabled="${this.isExtUpdateEnabled}"
-     can-load-unpacked="[[canLoadUnpacked]]"
+     ?can-load-unpacked="${this.canLoadUnpacked}"
-     is-child-account="[[isChildAccount_]]"
+     ?is-child-account="${this.isChildAccount_}"
-     dev-mode-controlled-by-policy="[[devModeControlledByPolicy]]"
+     ?dev-mode-controlled-by-policy="${this.devModeControlledByPolicy}"
 diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts
 --- a/chrome/browser/resources/extensions/manager.ts
 +++ b/chrome/browser/resources/extensions/manager.ts
-@@ -122,6 +122,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -146,6 +146,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-         value: () => loadTimeData.getBoolean('inDevMode'),
+        */
-       },
+       didInitPage_: {type: Boolean},
  
-+      isExtUpdateEnabled: {
++      isExtUpdateEnabled: {type: Boolean},
-+        type: Boolean,
-+        value: () => loadTimeData.getBoolean('isExtUpdateEnabled'),
-+      },
 +
-       showActivityLog: {
+       narrow_: {type: Boolean},
-         type: Boolean,
+ 
-         value: () => loadTimeData.getBoolean('showActivityLog'),
+       showDrawer_: {type: Boolean},
-@@ -223,6 +228,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -167,6 +169,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-   canLoadUnpacked: boolean;
+   inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
-   delegate: Service;
+   isMv2DeprecationNoticeDismissed: boolean =
-   inDevMode: boolean;
+       loadTimeData.getBoolean('MV2DeprecationNoticeDismissed');
-+  isExtUpdateEnabled: boolean;
++  isExtUpdateEnabled: boolean =
-   showActivityLog: boolean;
++      loadTimeData.getBoolean('isExtUpdateEnabled');
-   enableEnhancedSiteControls: boolean;
+   showActivityLog: boolean = loadTimeData.getBoolean('showActivityLog');
-   devModeControlledByPolicy: boolean;
+   enableEnhancedSiteControls: boolean =
-@@ -293,6 +299,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+       loadTimeData.getBoolean('enableEnhancedSiteControls');
-               profileInfo.isDeveloperModeControlledByPolicy;
+@@ -228,6 +232,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-           this.inDevMode = profileInfo.inDeveloperMode;
            this.canLoadUnpacked = profileInfo.canLoadUnpacked;
+           this.isMv2DeprecationNoticeDismissed =
+               profileInfo.isMv2DeprecationNoticeDismissed;
 +          this.isExtUpdateEnabled = profileInfo.isExtensionAutoupdateEnabled;
          };
      service.getProfileStateChangedTarget().addListener(onProfileStateChanged);
@@ -495,7 +544,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -284,6 +284,11 @@ export class Service implements ServiceInterface {
+@@ -293,6 +293,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -507,39 +556,42 @@ diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/res
    loadUnpacked(): Promise<boolean> {
      return this.loadUnpackedHelper_();
    }
-diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/resources/extensions/toolbar.html
+diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/resources/extensions/toolbar.css
---- a/chrome/browser/resources/extensions/toolbar.html
+--- a/chrome/browser/resources/extensions/toolbar.css
-+++ b/chrome/browser/resources/extensions/toolbar.html
++++ b/chrome/browser/resources/extensions/toolbar.css
-@@ -63,6 +63,11 @@
+@@ -73,6 +73,11 @@ cr-tooltip-icon {
-     margin-inline-end: 16px;
+   margin-inline-end: 16px;
-   }
+ }
  
-+  #need-update {
++#need-update {
-+    color: red;
++  color: red;
-+    margin-inline: 0px;
++  margin-inline: 0px;
-+  }
++}
 +
-   cr-toolbar {
+ cr-toolbar {
-     --cr-toolbar-center-basis: 680px;
+   --cr-toolbar-center-basis: 680px;
-     --cr-toolbar-field-max-width: var(--cr-toolbar-center-basis);
+   --cr-toolbar-field-max-width: var(--cr-toolbar-center-basis);
-@@ -88,6 +93,13 @@
+diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browser/resources/extensions/toolbar.html.ts
-         checked="[[inDevMode]]" aria-labelledby="devModeLabel">
+--- a/chrome/browser/resources/extensions/toolbar.html.ts
++++ b/chrome/browser/resources/extensions/toolbar.html.ts
+@@ -25,6 +25,13 @@ export function getHtml(this: ToolbarElement) {
+         aria-labelledby="devModeLabel">
      </cr-toggle>
    </div>
 +  <div class="more-actions">
 +    <span>$i18n{toolbarExtensionUpdateEnabled}
-+      <span id="need-update" hidden="[[!shouldShowRelaunchDialog]]">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
++      <span id="need-update" ?hidden="${!this.shouldShowRelaunchDialog}">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
 +    </span>
-+    <cr-toggle on-change="onExtUpdateEnabledChanged_" checked="[[isExtUpdateEnabled]]">
++    <cr-toggle @change="${this.onExtUpdateEnabledChanged_}" ?checked="${this.isExtUpdateEnabled}">
 +    </cr-toggle>
 +  </div>
  </cr-toolbar>
- <template is="dom-if" if="[[showPackDialog_]]" restamp>
+ ${this.showPackDialog_ ? html`
-   <extensions-pack-dialog delegate="[[delegate]]"
+   <extensions-pack-dialog .delegate="${this.delegate}"
 diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts
 --- a/chrome/browser/resources/extensions/toolbar.ts
 +++ b/chrome/browser/resources/extensions/toolbar.ts
-@@ -25,6 +25,8 @@ export interface ToolbarDelegate {
+@@ -26,6 +26,8 @@ export interface ToolbarDelegate {
     */
    setProfileInDevMode(inDevMode: boolean): void;
  
@@ -548,47 +600,51 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
    /** Opens the dialog to load unpacked extensions. */
    loadUnpacked(): Promise<boolean>;
  
-@@ -71,6 +73,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -42,6 +44,7 @@ class DummyToolbarDelegate {
-         reflectToAttribute: true,
+   updateAllExtensions(_extensions: chrome.developerPrivate.ExtensionInfo[]) {
+     return Promise.resolve();
+   }
++  setExtUpdateEnabled(_enabled: boolean) {}
+ }
+ 
+ export interface ExtensionsToolbarElement {
+@@ -80,6 +83,11 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+         reflect: true,
        },
  
 +      isExtUpdateEnabled: {
 +        type: Boolean,
-+        value: false,
++        reflect: true,
-+        observer: 'onExtUpdateEnabledChanged_',
-+        reflectToAttribute: true,
 +      },
 +
-       devModeControlledByPolicy: Boolean,
+       devModeControlledByPolicy: {type: Boolean},
-       isChildAccount: Boolean,
+       isChildAccount: {type: Boolean},
  
-@@ -87,6 +96,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -92,6 +100,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
  
-       expanded_: Boolean,
+       expanded_: {type: Boolean},
-       showPackDialog_: Boolean,
+       showPackDialog_: {type: Boolean},
-+      shouldShowRelaunchDialog: Boolean,
++      shouldShowRelaunchDialog: {type: Boolean},
  
        /**
         * Prevents initiating update while update is in progress.
-@@ -98,6 +108,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -103,6 +112,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
-   extensions: chrome.developerPrivate.ExtensionInfo[];
+   extensions: chrome.developerPrivate.ExtensionInfo[] = [];
-   delegate: ToolbarDelegate;
+   delegate: ToolbarDelegate = new DummyToolbarDelegate();
-   inDevMode: boolean;
+   inDevMode: boolean = false;
-+  isExtUpdateEnabled: boolean;
++  isExtUpdateEnabled: boolean = false;
 +  shouldShowRelaunchDialog: boolean = false;
-   devModeControlledByPolicy: boolean;
+   devModeControlledByPolicy: boolean = false;
-   isChildAccount: boolean;
+   isChildAccount: boolean = false;
  
-@@ -150,6 +162,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -155,6 +166,12 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
          'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
    }
  
-+  private onExtUpdateEnabledChanged_(evt: Event, value: boolean, _old: boolean) {
++  protected onExtUpdateEnabledChanged_(e: CustomEvent<boolean>) {
-+    if (evt instanceof Event) {
++    this.delegate.setExtUpdateEnabled(e.detail);
-+      this.delegate.setExtUpdateEnabled(value);
++    this.shouldShowRelaunchDialog = true;
-+      this.shouldShowRelaunchDialog = true;
++    this.isExtUpdateEnabled = e.detail;
-+      this.isExtUpdateEnabled = value;
-+    }
 +  }
 +
    private onInDevModeChanged_(_current: boolean, previous: boolean) {
@@ -613,16 +669,16 @@ 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
-@@ -59,6 +59,8 @@
+@@ -53,6 +53,8 @@
- #include "chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.h"
+ #include "ui/base/webui/web_ui_util.h"
- #endif
+ #include "ui/webui/webui_util.h"
  
 +#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
 +
  namespace extensions {
  
  namespace {
-@@ -345,6 +347,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -372,6 +374,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        {"itemSuspiciousInstallLearnMore",
         IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
        {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -631,9 +687,9 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
        {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
        {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
        {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -418,6 +422,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -445,6 +449,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
-   source->AddString("hostPermissionsLearnMoreLink",
+       "hostPermissionsLearnMoreLink",
-                     chrome_extension_constants::kRuntimeHostPermissionsHelpURL);
+       extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
    source->AddBoolean(kInDevModeKey, in_dev_mode);
 +
 +  source->AddBoolean("isExtUpdateEnabled",
@@ -645,7 +701,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
 diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc b/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 --- a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 +++ b/chrome/browser/update_client/chrome_update_query_params_delegate.cc
-@@ -35,15 +35,10 @@ ChromeUpdateQueryParamsDelegate::GetInstance() {
+@@ -33,15 +33,10 @@ ChromeUpdateQueryParamsDelegate::GetInstance() {
  }
  
  std::string ChromeUpdateQueryParamsDelegate::GetExtraParams() {
@@ -668,18 +724,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 {
+@@ -295,6 +295,7 @@ namespace developerPrivate {
-     boolean isDeveloperModeControlledByPolicy;
      boolean isIncognitoAvailable;
      boolean isChildAccount;
+     boolean isMv2DeprecationNoticeDismissed;
 +    boolean isExtensionAutoupdateEnabled;
    };
  
    // DEPRECATED: Prefer ExtensionInfo.
-@@ -335,6 +336,7 @@ namespace developerPrivate {
+@@ -354,6 +355,7 @@ namespace developerPrivate {
- 
    dictionary ProfileConfigurationUpdate {
      boolean? inDeveloperMode;
+     boolean? isMv2DeprecationNoticeDismissed;
 +    boolean? isExtensionAutoupdateEnabled;
    };
  
@@ -687,7 +743,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;
+@@ -85,9 +85,8 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
  // static
  std::string UpdateQueryParams::Get(ProdId prod) {
    return base::StringPrintf(
@@ -699,7 +755,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() {
+@@ -148,7 +147,7 @@ const char* UpdateQueryParams::GetNaclArch() {
  
  // static
  std::string UpdateQueryParams::GetProdVersion() {
@@ -745,15 +801,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 +837,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 +846,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 +855,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() {
+@@ -406,8 +431,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
-     return RespondNow(Error(keys::kNotAllowedInKioskError));
+   }
  
    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(
+@@ -547,8 +571,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;
+@@ -591,8 +615,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;
+@@ -736,8 +760,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;
+@@ -762,8 +786,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                                ->GetDelegate();
    target_extension_id_ = target_extension_id;
    const Extension* target_extension =
@@ -841,7 +921,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
      return RespondNow(Error(keys::kNoExtensionError, target_extension_id_));
-@@ -694,8 +717,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -828,8 +851,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
    // The extension can be uninstalled in another window while the UI was
    // showing. Do nothing in that case.
    const Extension* target_extension =
@@ -851,7 +931,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() {
+@@ -906,8 +928,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
        management::CreateAppShortcut::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -861,7 +941,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(
          ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
-@@ -827,8 +848,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -960,8 +981,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
        management::SetLaunchType::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -1068,7 +1148,7 @@ diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/brow
 diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc
 --- a/extensions/browser/updater/manifest_fetch_data.cc
 +++ b/extensions/browser/updater/manifest_fetch_data.cc
-@@ -107,7 +107,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
+@@ -105,7 +105,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
      : base_url_(update_url),
        full_url_(update_url),
        brand_code_(brand_code),
@@ -1077,7 +1157,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
        fetch_priority_(fetch_priority) {
    UpdateFullUrl(base_query_params);
    request_ids_.insert(request_id);
-@@ -161,18 +161,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
+@@ -158,18 +158,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
    // Compute the string we'd append onto the full_url_, and see if it fits.
    std::vector<std::string> parts;
    parts.push_back("id=" + id);
@@ -1110,9 +1190,9 @@ 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
-@@ -162,4 +162,19 @@ BASE_FEATURE(kUseItemSnippetsAPI,
+@@ -199,4 +199,18 @@ BASE_FEATURE(kRemoveCoreSiteInstance,
-              "UseItemSnippetsAPI",
+              "RemoveCoreSiteInstance",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.
@@ -1128,14 +1208,13 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 +CROMITE_FEATURE(kEnableExtensionManagementToChromeStore,
 +                "EnableExtensionToChromeStore",
 +                base::FEATURE_DISABLED_BY_DEFAULT);
-+
  }  // namespace extensions_features
 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
-@@ -202,6 +202,10 @@ BASE_DECLARE_FEATURE(kDeclarativeNetRequestResponseHeaderMatching);
+@@ -241,6 +241,10 @@ BASE_DECLARE_FEATURE(kSilentDebuggerExtensionAPI);
- // If enabled, use the new CWS itemSnippets API to fetch extension info.
+ // nothing breaks.
- BASE_DECLARE_FEATURE(kUseItemSnippetsAPI);
+ BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance);
  
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
 +
@@ -1147,20 +1226,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 {
+@@ -280,6 +280,7 @@ declare global {
-         isDeveloperModeControlledByPolicy: boolean;
          isIncognitoAvailable: boolean;
          isChildAccount: boolean;
+         isMv2DeprecationNoticeDismissed: boolean;
 +        isExtensionAutoupdateEnabled: boolean;
        }
  
        export interface ExtensionConfigurationUpdate {
-@@ -277,7 +278,8 @@ declare global {
+@@ -296,6 +297,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 ++
+ services/network/network_context.cc           | 1 +
- 6 files changed, 15 insertions(+), 1 deletion(-)
+ 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
-@@ -1186,6 +1186,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1317,6 +1317,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
-       base::BindOnce(&NetworkContext::OnHttpCacheCleared,
+                                     base::Time end_time,
-                      base::Unretained(this), std::move(callback))));
+                                     mojom::ClearDataFilterPtr filter,
- 
+                                     ClearHttpCacheCallback callback) {
 +  cors_preflight_controller_.ClearCache();
-+
+   // It's safe to use Unretained below as the HttpCacheDataRemover is owned by
-   NetworkServiceMemoryCache* memory_cache = GetMemoryCache();
+   // |this| and guarantees it won't call its callback if deleted.
-   if (memory_cache)
+   http_cache_data_removers_.push_back(HttpCacheDataRemover::CreateAndStart(
-     memory_cache->Clear();
 --

build/patches/Client-hints-overrides.patch

@@ -7,22 +7,22 @@ Use Google Chrome branding for client hints
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/embedder_support/user_agent_utils.cc |  4 +---
+ components/embedder_support/user_agent_utils.cc   |  4 +---
- content/browser/client_hints/client_hints.cc    | 17 +++++++++++------
+ content/browser/client_hints/client_hints.cc      | 15 ++++++++++-----
- .../loader/navigation_url_loader_impl.cc        |  5 +++++
+ .../browser/loader/navigation_url_loader_impl.cc  |  5 +++++
- .../about_flags_cc/Client-hints-overrides.inc   |  9 +++++++++
+ .../about_flags_cc/Client-hints-overrides.inc     |  9 +++++++++
- .../features_cc/Client-hints-overrides.inc      |  1 +
+ .../common/features_cc/Client-hints-overrides.inc |  1 +
- .../cpp/features_cc/Client-hints-overrides.inc  |  1 +
+ .../cpp/features_cc/Client-hints-overrides.inc    |  1 +
- net/http/http_network_transaction.cc            |  1 +
+ net/http/http_network_transaction.cc              |  1 +
- services/network/public/cpp/client_hints.cc     |  1 +
+ services/network/public/cpp/client_hints.cc       |  1 +
- .../blink/common/client_hints/client_hints.cc   |  6 ++++--
+ .../blink/common/client_hints/client_hints.cc     |  6 ++++--
- .../common/client_hints/enabled_client_hints.cc |  4 +++-
+ .../common/client_hints/enabled_client_hints.cc   |  6 ++++++
- .../blink/renderer/core/frame/navigator_ua.idl  |  4 +++-
+ .../blink/renderer/core/frame/navigator_ua.idl    |  4 +++-
- .../renderer/core/frame/navigator_ua_data.cc    |  1 +
+ .../renderer/core/frame/navigator_ua_data.cc      |  1 +
- .../renderer/core/frame/navigator_ua_data.idl   |  5 ++++-
+ .../renderer/core/frame/navigator_ua_data.idl     |  5 ++++-
- .../renderer/core/loader/base_fetch_context.cc  |  6 ++++--
+ .../renderer/core/loader/frame_fetch_context.cc   |  4 +++-
- .../platform/runtime_enabled_features.json5     |  5 +++++
+ .../platform/runtime_enabled_features.json5       |  5 +++++
- 15 files changed, 54 insertions(+), 16 deletions(-)
+ 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
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
 --- a/components/embedder_support/user_agent_utils.cc
 +++ b/components/embedder_support/user_agent_utils.cc
-@@ -187,9 +187,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -190,9 +190,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
    bool parse_result = base::StringToInt(major_version, &major_version_number);
    DCHECK(parse_result);
    std::optional<std::string> brand;
@@ -38,13 +38,13 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 -  brand = version_info::GetProductName();
 -#endif
 +  brand = "Google Chrome";
-   std::optional<std::string> maybe_brand_override =
+ 
-       base::GetFieldTrialParamValueByFeature(features::kGreaseUACH,
+   std::string brand_version =
-                                              "brand_override");
+       output_version_type == blink::UserAgentBrandVersionType::kFullVersion
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -55,6 +55,7 @@
+@@ -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"
@@ -52,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,
+@@ -704,7 +705,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
-                         : 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(
      // value, disable them. This overwrites previous decision from UI.
      disable_due_to_custom_ua = !ua_metadata.has_value();
    }
@@ -72,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(
+@@ -886,10 +888,12 @@ void AddRequestClientHintsHeaders(
      AddEctHeader(headers, network_quality_tracker, url);
    }
  
@@ -89,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);
+@@ -975,6 +979,7 @@ ParseAndPersistAcceptCHForNavigation(
+     BrowserContext* context,
+     ClientHintsControllerDelegate* delegate,
+     FrameTreeNode* frame_tree_node) {
++  if ((true)) return std::nullopt;
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+   DCHECK(context);
+   DCHECK(parsed_headers);
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1185,6 +1185,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1283,6 +1283,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -133,7 +131,7 @@ new file mode 100644
 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
 --- a/net/http/http_network_transaction.cc
 +++ b/net/http/http_network_transaction.cc
-@@ -102,6 +102,7 @@ const size_t kMaxRestarts = 32;
+@@ -109,6 +109,7 @@ const size_t kMaxRestarts = 32;
  
  // Returns true when Early Hints are allowed on the given protocol.
  bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -144,7 +142,7 @@ diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transa
 diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc
 --- a/services/network/public/cpp/client_hints.cc
 +++ b/services/network/public/cpp/client_hints.cc
-@@ -120,6 +120,7 @@ const DecodeMap& GetDecodeMap() {
+@@ -112,6 +112,7 @@ const DecodeMap& GetDecodeMap() {
  
  std::optional<std::vector<network::mojom::WebClientHintsType>>
  ParseClientHintsHeader(const std::string& header) {
@@ -159,7 +157,7 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
  #include "base/strings/string_util.h"
  #include "services/network/public/cpp/client_hints.h"
  #include "third_party/blink/public/common/features.h"
-+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
++#include "third_party/blink/public/common/features_generated.h"
  #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
  #include "url/origin.h"
  
@@ -172,7 +170,7 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
      case network::mojom::WebClientHintsType::kUAMobile:
      case network::mojom::WebClientHintsType::kUAPlatform:
 -      return true;
-+      return RuntimeEnabledFeatures::UserAgentClientHintEnabled();
++      return base::FeatureList::IsEnabled(blink::features::kUserAgentClientHint);
 +    case network::mojom::WebClientHintsType::kSaveData:
 +      return false;
      default:
@@ -181,31 +179,19 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
 diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc
 --- a/third_party/blink/common/client_hints/enabled_client_hints.cc
 +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc
-@@ -15,6 +15,7 @@ namespace {
+@@ -15,6 +15,12 @@ namespace {
  using ::network::mojom::WebClientHintsType;
  
  bool IsDisabledByFeature(const WebClientHintsType type) {
++  if (type == WebClientHintsType::kUA ||
++        type == WebClientHintsType::kUAMobile ||
++        type == WebClientHintsType::kUAPlatform) {
++    return false;
++  }
 +  if ((true)) return true;
    switch (type) {
      case WebClientHintsType::kUA:
      case WebClientHintsType::kUAArch:
-@@ -96,7 +97,7 @@ bool IsDisabledByFeature(const WebClientHintsType type) {
- }  // namespace
- 
- bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const {
--  return enabled_types_[static_cast<int>(type)];
-+  return false;
- }
- 
- void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
-@@ -107,6 +108,7 @@ void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
- 
- std::vector<WebClientHintsType> EnabledClientHints::GetEnabledHints() const {
-   std::vector<WebClientHintsType> hints;
-+  if ((true)) return hints;
-   for (const auto& elem : network::GetClientHintToNameMap()) {
-     const auto& type = elem.first;
-     if (IsEnabled(type))
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_party/blink/renderer/core/frame/navigator_ua.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua.idl
@@ -245,42 +231,33 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third
    [HighEntropy, MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
    [HighEntropy=Direct, MeasureAs=NavigatorUAData_Mobile]  readonly attribute boolean mobile;
    [HighEntropy=Direct, MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
-diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.cc b/third_party/blink/renderer/core/loader/base_fetch_context.cc
+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/base_fetch_context.cc
+--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-+++ b/third_party/blink/renderer/core/loader/base_fetch_context.cc
++++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -167,7 +167,7 @@ void BaseFetchContext::AddClientHintsIfNecessary(
+@@ -217,6 +217,8 @@ bool ShouldSendClientHint(const PermissionsPolicy& policy,
-   // specifying accomponying client hints, in which case we disable sending
+                           bool is_1p_origin,
-   // them.
+                           network::mojom::blink::WebClientHintsType type,
-   using network::mojom::blink::WebClientHintsType;
+                           const ClientHintsPreferences& hints_preferences) {
--  if (ua) {
++  if (!RuntimeEnabledFeatures::UserAgentClientHintEnabled())
-+  if (RuntimeEnabledFeatures::UserAgentClientHintEnabled() && ua) {
++    return false;
-     // ShouldSendClientHint is called to make sure UA is controlled by
+   // For subresource requests, sending the hint in the fetch request based on
-     // Permissions Policy.
+   // the permissions policy.
-     if (ShouldSendClientHint(policy, resource_origin, is_1p_origin,
+   if (!policy.IsFeatureEnabledForOrigin(
-@@ -329,7 +329,7 @@ void BaseFetchContext::AddClientHintsIfNecessary(
+@@ -610,7 +612,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,
+     // ShouldSendClientHint is called to make sure UA is controlled by
-                              WebClientHintsType::kUAArch, hints_preferences)) {
+     // Permissions Policy.
-       SetHttpHeader(WebClientHintsType::kUAArch,
+     if (ShouldSendClientHint(*policy, resource_origin, is_1p_origin,
-@@ -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 ||
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -340,6 +340,11 @@
+@@ -417,6 +417,11 @@
-       name: "AtomicMoveOverride",
+       name: "AriaNotify",
-       // No "status" field, so that this is not enabled on WPTs by default.
+       status: "test",
      },
 +    {
 +      name: "UserAgentClientHint",
@@ -288,6 +265,6 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      base_feature: "UserAgentClientHint",
 +    },
      {
-       name: "AttributionReporting",
+       name: "AriaRowColIndexText",
-       origin_trial_feature_name: "PrivacySandboxAdsAPIs",
+       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
+@@ -220,9 +220,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(
+@@ -303,10 +302,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
+@@ -472,7 +472,7 @@ const base::FeatureParam<bool> kIpPrivacyOnlyInIncognito{
+ // 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/Cromite-Branding--improve-settings-ui.patch

@@ -0,0 +1,295 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 21 Sep 2024 15:32:02 +0000
+Subject: Cromite Branding: improve settings ui
+
+Modification to the settings ui with the aim of making it clearer.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/android/chrome_java_resources.gni      |   2 +-
+ .../android/java/res/xml/main_preferences.xml |   4 +-
+ .../res/xml/privacy_preferences_cromite.xml   | 198 ++++++++++++++++++
+ .../privacy/settings/PrivacySettings.java     |   4 +-
+ .../Cromite-settings-ui.grdp                  |  15 ++
+ 5 files changed, 218 insertions(+), 5 deletions(-)
+ create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+
+diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
+--- a/chrome/android/chrome_java_resources.gni
++++ b/chrome/android/chrome_java_resources.gni
+@@ -640,7 +640,7 @@ chrome_java_resources = [
+   "java/res/xml/manage_sync_preferences.xml",
+   "java/res/xml/personalize_google_services_preferences.xml",
+   "java/res/xml/incognito_preferences.xml",
+-  "java/res/xml/privacy_preferences.xml",
++  "java/res/xml/privacy_preferences.xml", "java/res/xml/privacy_preferences_cromite.xml",
+   "java/res/xml/referer_policy_preferences.xml",
+   "java/res/layout/radio_button_group_referer_policy_preference.xml",
+   "java/res/xml/search_widget_info.xml",
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
++++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -15,7 +15,7 @@ for the previous order (main_preferences_legacy). -->
+ <!-- `order=0` is reserved and it will be added in code.  -->
+ <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
+     <PreferenceCategory
+-        android:key="account_and_google_services_section"
++        android:key="account_and_google_services_section" app:isPreferenceVisible="false"
+         android:order="1001"
+         android:title="@string/prefs_section_account_and_google_services"/>
+     <org.chromium.chrome.browser.sync.settings.SignInPreference
+@@ -28,7 +28,7 @@ for the previous order (main_preferences_legacy). -->
+         android:layout="@layout/account_management_account_row"
+         android:title="@string/sync_category_title"/>
+     <org.chromium.components.browser_ui.settings.ChromeBasePreference
+-        android:key="google_services"
++        android:key="google_services" app:isPreferenceVisible="false"
+         android:order="1004"
+         android:layout="@layout/account_management_account_row"
+         android:title="@string/prefs_google_services"
+diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
+@@ -0,0 +1,198 @@
++<?xml version="1.0" encoding="utf-8"?><!--
++Copyright 2022 The Chromium Authors
++Use of this source code is governed by a BSD-style license that can be
++found in the LICENSE file.
++-->
++
++<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:app="http://schemas.android.com/apk/res-auto">
++
++    <PreferenceCategory
++        android:title="@string/browsing_data_section_title"/>
++    <Preference
++        android:key="clear_browsing_data"
++        android:title="@string/clear_browsing_data_title"
++        android:summary="@string/clear_browsing_data_summary"
++        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" />
++    <Preference
++        android:key="clear_browsing_data_advanced"
++        android:title="@string/clear_browsing_data_title"
++        android:summary="@string/clear_browsing_data_summary"
++        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAdvanced"
++        app:isPreferenceVisible="false" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="close_tabs_on_exit"
++        android:title="@string/close_tabs_on_exit_title"
++        android:summary="@string/close_tabs_on_exit_summary"
++        android:defaultValue="false" />
++    <org.chromium.components.browser_ui.settings.SpinnerPreference
++        android:key="history_expire_days_threshold"
++        android:persistent="false"
++        android:title="@string/history_expire_days_threshold_title"
++        android:summary="@string/history_expire_days_threshold_summary"
++        app:singleLine="true" />
++
++    <PreferenceCategory
++        android:title="@string/data_exposed_to_website_section_title"/>
++    <org.chromium.components.browser_ui.settings.ChromeBasePreference
++        android:key="third_party_cookies"
++        android:title="@string/third_party_cookies_link_row_label"
++        android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings" />
++    <Preference
++        android:key="do_not_track"
++        android:title="@string/do_not_track_title"
++        android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
++    <Preference
++        android:key="gpc"
++        android:title="@string/gpc_title"
++        android:fragment="org.chromium.chrome.browser.privacy.settings.GpcSettings" />
++    <Preference
++        android:key="referers_policy"
++        android:title="@string/referers_policy_title"
++        android:fragment="org.chromium.chrome.browser.privacy.settings.RefererSettingsFragment"/>
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="can_make_payment"
++        android:title="@string/can_make_payment_title"
++        android:summary="@string/settings_can_make_payment_toggle_label" />
++
++    <PreferenceCategory
++        android:title="@string/data_exposed_to_device_section_title"/>
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="allow_custom_tab_intents"
++        android:title="@string/allow_custom_tab_intents_title"
++        android:summary="@string/allow_custom_tab_intents_summary"
++        android:defaultValue="false" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:title="@string/uses_separate_storagepartition_for_cct_title"
++        android:summary="@string/uses_separate_storagepartition_for_cct_summary"
++        app:featureName="maylaunchurl-uses-separate-storage-partition"
++        app:needRestart="true" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="allow_external_intent_requests"
++        android:title="@string/allow_external_intent_requests_title"
++        android:summary="@string/allow_external_intent_requests_summary"
++        app:featureName="AllowExternalIntentRequests"
++        app:needRestart="false" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="use_tab_switcher_list_mode"
++        android:title="@string/tab_switcher_list_mode_title"
++        android:summary="@string/tab_switcher_list_mode_summary"
++        app:featureName="TabSwitcherListMode"
++        app:needRestart="true" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="tabgrid_use_icons"
++        android:title="@string/tabgrid_use_icons_title"
++        android:summary="@string/tabgrid_use_icons_summary"
++        android:defaultValue="false" />
++
++    <PreferenceCategory
++        android:title="@string/incognito_related_section_title"/>
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="open_external_links_incognito"
++        android:title="@string/open_external_links_incognito_title"
++        android:summary="@string/open_external_links_incognito_summary"
++        android:defaultValue="false" />
++    <org.chromium.chrome.browser.incognito.reauth.IncognitoReauthSettingSwitchPreference
++        android:key="incognito_lock"
++        android:title="@string/settings_incognito_tab_lock_title"
++        android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
++        android:persistent="false" />
++    <Preference
++        android:key="incognito_settings"
++        android:title="@string/incognito_settings_title"
++        android:summary="@string/incognito_settings_summary"
++        android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
++
++    <PreferenceCategory
++        android:key="security_section"
++        android:title="@string/security_section_title"/>
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="https_first_mode_legacy"
++        android:title="@string/settings_https_first_mode_title"
++        android:summary="@string/settings_https_first_mode_summary" />
++    <Preference
++        android:key="https_first_mode"
++        android:title="@string/settings_https_first_mode_title"
++        android:fragment="org.chromium.chrome.browser.ssl.HttpsFirstModeSettingsFragment" />
++    <org.chromium.components.browser_ui.settings.ChromeBasePreference
++        android:key="secure_dns"
++        android:title="@string/settings_secure_dns_title"
++        android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
++
++    <PreferenceCategory
++        android:title="@string/services_category_title"/>
++    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
++        android:key="proxy"
++        android:title="@string/proxy_title"
++        app:url="@string/proxy_url" />
++    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
++        android:key="cromite_flags"
++        android:title="@string/cromite_flags_title"
++        app:url="@string/cromite_flags_url" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="search_suggestions"
++        android:title="@string/improve_search_suggestions_title"
++        android:summary="@string/improve_search_suggestions_summary"
++        android:persistent="false"/>
++    <Preference
++        android:key="phone_as_a_security_key"
++        android:title="@string/cablev2_paask_title"
++        android:summary="@string/cablev2_paask_body"
++        android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />
++
++    <!--Always hidden-->
++    <Preference
++        android:key="safe_browsing"
++        android:title="@string/prefs_safe_browsing_title"
++        android:summary="@string/prefs_safe_browsing_summary"
++        android:fragment="org.chromium.chrome.browser.safe_browsing.settings.SafeBrowsingSettingsFragment"
++        app:isPreferenceVisible="false" />
++    <org.chromium.components.browser_ui.settings.ChromeBasePreference
++        android:key="contextual_search"
++        android:title="@string/contextual_search_title"
++        android:fragment="org.chromium.chrome.browser.contextualsearch.ContextualSearchSettingsFragment"
++        app:isPreferenceVisible="false" />
++    <Preference
++        android:key="privacy_guide"
++        app:isPreferenceVisible="false"
++        android:title="@string/privacy_guide_pref_title"
++        android:summary="@string/privacy_guide_pref_summary"
++        android:fragment="org.chromium.chrome.browser.privacy_guide.PrivacyGuideFragment" />
++    <Preference
++        android:key="tracking_protection"
++        android:title="@string/third_party_cookies_link_row_label"
++        android:fragment="org.chromium.components.privacy_sandbox.TrackingProtectionSettings"
++        app:isPreferenceVisible="false" />
++    <Preference
++        android:key="ip_protection"
++        android:title="@string/ip_protection_title"
++        android:fragment="org.chromium.components.privacy_sandbox.IpProtectionSettingsFragment"
++        app:isPreferenceVisible="false" />
++    <Preference
++        android:key="fp_protection"
++        android:title="@string/tracking_protection_fingerprinting_protection_title"
++        android:fragment="org.chromium.components.privacy_sandbox.FingerprintingProtectionSettingsFragment"
++        app:isPreferenceVisible="false" />
++    <Preference
++        android:key="privacy_sandbox"
++        android:title="@string/ad_privacy_link_row_label"
++        android:summary="@string/ad_privacy_link_row_sub_label"
++        android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment" />
++    <Preference
++        android:key="preload_pages"
++        android:title="@string/preload_pages_title"
++        android:summary="@string/preload_pages_summary"
++        android:fragment="org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment"
++        app:isPreferenceVisible="false" />
++    <org.chromium.components.browser_ui.settings.TextMessagePreference
++        android:key="sync_and_services_link"
++        android:summary="@string/privacy_sync_and_services_link_legacy"
++        app:allowDividerBelow="false"
++        app:isPreferenceVisible="false" />
++    <org.chromium.components.browser_ui.settings.ChromeBasePreference
++        android:key="javascript_optimizer"
++        android:title="@string/website_settings_privacy_and_security_javascript_optimizer_row_label"
++        android:summary="@string/website_settings_privacy_and_security_javascript_optimizer_summary"
++        android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
++        app:isPreferenceVisible="false" />
++</PreferenceScreen>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -152,7 +152,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+         mPageTitle.set(getString(R.string.prefs_privacy_security));
+ 
+-        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
++        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
+ 
+         Preference fpProtectionPreference = findPreference(PREF_FP_PROTECTION);
+         fpProtectionPreference.setVisible(shouldShowFpProtectionUi());
+@@ -249,7 +249,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
+         if (ChromeFeatureList.isEnabled(ChromeFeatureList.PASSWORD_LEAK_TOGGLE_MOVE)) {
+             passwordLeakTogglePref.setOnPreferenceChangeListener(this);
+-        } else {
++        } else if (passwordLeakTogglePref != null) {
+             passwordLeakTogglePref.setVisible(false);
+         }
+ 
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="utf-8"?>
++<grit-part>
++    <message name="IDS_BROWSING_DATA_SECTION_TITLE" desc="">
++        Browsing data
++    </message>
++    <message name="IDS_DATA_EXPOSED_TO_WEBSITE_SECTION_TITLE" desc="">
++        Data exposed to the websites
++    </message>
++    <message name="IDS_INCOGNITO_RELATED_SECTION_TITLE" desc="">
++        Incognito mode
++    </message>
++    <message name="IDS_DATA_EXPOSED_TO_DEVICE_SECTION_TITLE" desc="">
++        Data exposed in the device
++    </message>
++</grit-part>
+--

build/patches/Cromite-Branding.patch

@@ -25,8 +25,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../mipmap-xxxhdpi/app_icon.png               | Bin 9667 -> 20837 bytes
  .../mipmap-xxxhdpi/layered_app_icon.png       | Bin 3652 -> 29220 bytes
  .../layered_app_icon_background.png           | Bin 3519 -> 142032 bytes
- .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
+ .../values/channel_constants.xml              |   8 +-
- .../inline/BromiteInlineUpdateController.java |  21 +++-
+ .../inline/BromiteInlineUpdateController.java |  19 +++-
  chrome/app/extensions_strings.grdp            |   4 +-
  chrome/app/settings_strings.grdp              |   2 +-
  chrome/app/theme/chromium/BRANDING            |   8 +-
@@ -35,11 +35,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../theme/chromium/win/tiles/SmallLogo.png    | Bin 9784 -> 12363 bytes
  .../chromium/product_logo_32.png              | Bin 822 -> 2301 bytes
  chrome/browser/BUILD.gn                       |   1 +
+ .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
+ chrome/browser/prefs/BUILD.gn                 |   1 +
  .../prefs/chrome_pref_service_factory.cc      |   6 +-
  .../profiles/profile_shortcut_manager_win.cc  |   2 +-
- .../settings/settings_menu/settings_menu.html |   5 +-
+ .../settings/settings_menu/settings_menu.html |  14 ++-
  .../strings/android_chrome_strings.grd        |   2 +-
+ .../toolbar/chrome_labs/chrome_labs_utils.cc  |   1 +
  chrome/common/url_constants.h                 |   4 +-
+ .../install_static/chromium_install_modes.cc  |   2 +-
  .../strings/android/browser_ui_strings.grd    |   2 +-
  .../drawable-hdpi/fre_product_logo.png        | Bin 3912 -> 22295 bytes
  .../drawable-mdpi/fre_product_logo.png        | Bin 2490 -> 12171 bytes
@@ -51,9 +55,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
  .../chromium/product_logo.png                 | Bin 2714 -> 7923 bytes
  .../chromium/product_logo_white.png           | Bin 2512 -> 6790 bytes
+ .../version_ui/resources/about_version.ts     |   2 +-
+ .../resources/about_version_mobile.css        |   9 ++
+ content/child/runtime_features.cc             |  26 +++--
  tools/grit/grit/grd_reader.py                 |  35 +++++++
- ui/base/ui_base_features.cc                   |   2 +
+ 55 files changed, 189 insertions(+), 120 deletions(-)
- 49 files changed, 155 insertions(+), 100 deletions(-)
 
 diff --git a/build/BUILD.gn b/build/BUILD.gn
 --- a/build/BUILD.gn
@@ -76,7 +82,7 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -183,6 +183,10 @@ declare_args() {
+@@ -186,6 +186,10 @@ declare_args() {
    clang_unsafe_buffers_paths = ""
  }
  
@@ -90,7 +96,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -174,7 +174,7 @@ by a child template that "extends" this file.
+@@ -178,7 +178,7 @@ by a child template that "extends" this file.
        <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
          android:icon="@drawable/ic_launcher"
          android:roundIcon="@drawable/ic_launcher_round"
@@ -122,8 +128,8 @@ diff --git a/chrome/android/java/res/xml/legal_information_preferences.xml b/chr
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -14,20 +14,20 @@ found in the LICENSE file.
+@@ -16,20 +16,20 @@ for the previous order (main_preferences_legacy). -->
-         android:order="0"/>
+ <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
      <PreferenceCategory
          android:key="account_and_google_services_section"
 -        android:order="1"
@@ -9112,22 +9118,26 @@ zk0U>@{Db0uvVi{o$%=-6@&Jp4mhhHYo~{+5O$ZdgIR*B?vJ5$!R3PXBkQ0>lqcPjJ
 zG!=nXw2&abs#xr~fFDF!vq@X7`+qtd5cw$r{cp#9R6!ToGG#p=PkT1k)Wlt8^P%Pg
 W=g!Ha2?pSwIRxeC=1^|uclqCxqvpf_
 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml b/chrome/android/java/res_chromium_base/values/channel_constants.xml
---- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+--- a/chrome/android/java/res_chromium_base/values/channel_constants.xml
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
++++ b/chrome/android/java/res_chromium_base/values/channel_constants.xml
-@@ -37,7 +37,7 @@ public class UpdateConfigs {
+@@ -7,8 +7,8 @@ found in the LICENSE file.
-     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
-     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
  
--    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS;
+ <resources xmlns:android="http://schemas.android.com/apk/res/android">
-+    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 1 * DateUtils.DAY_IN_MILLIS;
+     <!-- The application name displayed to the user. -->
-     private static final long DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS = 2 * DateUtils.DAY_IN_MILLIS;
+-    <string name="app_name" translatable="false">Chromium</string>
- 
+-    <string name="bookmark_widget_title" translatable="false">Chromium bookmarks</string>
-     /** Possible update flow configurations. */
+-    <string name="search_widget_title" translatable="false">Chromium search</string>
+-    <string name="quick_action_search_widget_title" translatable="false">Chromium quick action search</string>
++    <string name="app_name" translatable="false">Cromite</string>
++    <string name="bookmark_widget_title" translatable="false">Cromite bookmarks</string>
++    <string name="search_widget_title" translatable="false">Cromite search</string>
++    <string name="quick_action_search_widget_title" translatable="false">Cromite quick action search</string>
+ </resources>
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
-@@ -61,10 +61,10 @@ import org.chromium.chrome.browser.omaha.VersionNumber;
+@@ -62,10 +62,10 @@ import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse;
  public class BromiteInlineUpdateController implements InlineUpdateController {
  
      private static final String TAG = "BromiteInlineUpdateController";
@@ -9140,9 +9150,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 +    private final String UPSTREAM_VERSION_URL = "";
 +    public static final String VULNERABLE_VERSION_DOC_URL = "";
  
-     public static String getDownloadUrl() {
+     @Override
-         return UPDATE_VERSION_URL + BuildConfig.BUILD_TARGET_CPU + "_ChromePublic.apk";
+     public String getDownloadUrl() {
-@@ -213,11 +213,20 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
+@@ -223,6 +223,13 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
                          Log.i(TAG, "BromiteUpdater: obtained response '%s' and redirect URL '%s'", endpointResponse.getResponseString(), redirectURL);
                          if (redirectURL.indexOf(REDIRECT_URL_PREFIX) == 0) {
                              redirectURL = redirectURL.substring(REDIRECT_URL_PREFIX.length());
@@ -9156,14 +9166,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
                              String[] parts = redirectURL.split(Pattern.quote("/"));
                              if (parts.length > 0) {
                                  VersionNumber version = VersionNumber.fromString(parts[0]);
-                                 if (version != null) {
+@@ -252,6 +259,10 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
-                                     versionFound = true;
-+                                    if (UPSTREAM_VERSION_URL.equals(""))
-+                                        OmahaBase.updateLastPushedTimeStamp(System.currentTimeMillis());
-                                     OmahaBase.setLatestModifiedVersion(parts[0]);
-                                     callback.onResult(version);
-                                     return;
-@@ -240,6 +249,10 @@ public class BromiteInlineUpdateController implements InlineUpdateController {
      }
  
      private void checkLatestUpstreamVersion(final Callback<VersionNumber> callback) {
@@ -9177,7 +9180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -380,7 +380,7 @@
+@@ -392,7 +392,7 @@
      No recent activities
    </message>
    <message name="IDS_EXTENSIONS_NO_INSTALLED_ITEMS" desc="The message shown to the user on the Extensions settings page when there are no extensions or apps installed.">
@@ -9186,7 +9189,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
    </message>
    <message name="IDS_EXTENSIONS_NO_DESCRIPTION" desc="The message shown to the user when an extension does not have any description.">
      No description provided
-@@ -515,7 +515,7 @@
+@@ -530,7 +530,7 @@
      My extensions
    </message>
    <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar to open the Chrome Web Store to get more extensions.">
@@ -9198,7 +9201,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -323,7 +323,7 @@
+@@ -275,7 +275,7 @@
      Change
    </message>
    <message name="IDS_SETTINGS_WEB_STORE" desc="Sub-label about choosing something from the Chrome Web Store.">
@@ -13152,26 +13155,49 @@ e)fqMZZ`3a)Ds&5H<cfp<0000<MNUMnLSTYHt&Yn8
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2095,6 +2095,7 @@ static_library("browser") {
+@@ -1811,6 +1811,7 @@ static_library("browser") {
-     "//build:chromeos_buildflags",
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
+     "//build/config/linux/dbus:buildflags",
 +    "//build:cromite_buildflags",
      "//cc",
      "//chrome:extra_resources",
      "//chrome:resources",
+diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+--- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
++++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+@@ -37,7 +37,7 @@ public class UpdateConfigs {
+     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
+     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
+ 
+-    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS;
++    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 1 * DateUtils.DAY_IN_MILLIS;
+     private static final long DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS = 2 * DateUtils.DAY_IN_MILLIS;
+ 
+     /** Possible update flow configurations. */
+diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
+--- a/chrome/browser/prefs/BUILD.gn
++++ b/chrome/browser/prefs/BUILD.gn
+@@ -52,6 +52,7 @@ source_set("impl") {
+   deps = [
+     ":prefs",
+     ":util",
++    "//build:cromite_buildflags",
+     "//chrome/browser:browser_process",
+     "//chrome/browser/devtools",
+     "//chrome/browser/media/prefs",
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -24,6 +24,7 @@
+@@ -30,6 +30,7 @@
  #include "build/branding_buildflags.h"
  #include "build/build_config.h"
  #include "build/chromeos_buildflags.h"
 +#include "build/cromite_flags.h"
  #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
- #include "chrome/browser/prefs/chrome_command_line_pref_store.h"
+@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
-@@ -270,10 +271,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
  #endif
    std::string seed;
    CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13198,23 +13224,38 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/br
 diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
 --- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
 +++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
-@@ -31,9 +31,10 @@
+@@ -10,6 +10,18 @@
+         -webkit-tap-highlight-color: transparent;
        }
  
-       #aboutIcon {
++      #aboutIcon {
--        --cr-icon-image: url(//resources/images/chrome_logo_dark.svg);
 +        background: url('chrome://theme/current-channel-logo@1x');
 +        background-size: 20px 20px;
 +        filter: grayscale();
-         -webkit-mask-size: 18px;
++        -webkit-mask-size: 18px;
--        background-color: var(--iron-icon-fill-color);
++        display: block;
-         display: block;
++        height: var(--cr-icon-size);
-         height: var(--cr-icon-size);
++        margin-inline-end: 20px;
-         margin-inline-end: 20px;
++        margin-inline-start: 0;
++        width: var(--cr-icon-size);
++      }
++
+       #menu {
+         color: var(--google-grey-700);
+         display: flex;
+@@ -173,7 +185,7 @@
+         </a>
+         <a role="menuitem" id="about-menu" href="/help"
+             class="cr-nav-menu-item">
+-          <cr-icon icon="cr:chrome-product"></cr-icon>
++          <span id="aboutIcon" class="cr-icon" role="presentation"></span>
+           $i18n{aboutPageTitle}
+           <cr-ripple></cr-ripple>
+         </a>
 diff --git a/chrome/browser/ui/android/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
-@@ -2178,7 +2178,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2474,7 +2474,7 @@ Your Google account may have other forms of browsing history like searches and a
          About Chrome
        </message>
        <message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
@@ -13223,10 +13264,21 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
          Application version
+diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+--- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
++++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
+@@ -144,6 +144,7 @@ bool AreNewChromeLabsExperimentsAvailable(const ChromeLabsModel* model,
+ }
+ 
+ bool IsChromeLabsEnabled() {
++  if ((true)) return false;
+   // Always early out on the stable channel regardless of other conditions.
+   if (chrome::GetChannel() == version_info::Channel::STABLE) {
+     return false;
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -126,7 +126,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
+@@ -136,7 +136,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  inline constexpr char kChromeHelpViaWebUIURL[] =
@@ -13235,27 +13287,39 @@ diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  inline constexpr char kChromeOsHelpViaWebUIURL[] =
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -189,7 +189,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -199,7 +199,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
      "chrome-untrusted://new-tab-page/";
  
  // The URL for the Chromium project used in the About dialog.
 -inline constexpr char16_t kChromiumProjectURL[] = u"https://www.chromium.org/";
 +inline constexpr char16_t kChromiumProjectURL[] = u"https://www.cromite.org/";
  
- inline constexpr char16_t kContentSettingsExceptionsLearnMoreURL[] =
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-     u"https://support.google.com/chrome?p=settings_manage_exceptions";
+ // The URL for the "Clear browsing data in Chrome" help center article.
+diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_static/chromium_install_modes.cc
+--- a/chrome/install_static/chromium_install_modes.cc
++++ b/chrome/install_static/chromium_install_modes.cc
+@@ -16,7 +16,7 @@ namespace install_static {
+ 
+ const wchar_t kCompanyPathName[] = L"";
+ 
+-const wchar_t kProductPathName[] = L"Chromium";
++const wchar_t kProductPathName[] = L"Cromite";
+ 
+ const size_t kProductPathNameLength = _countof(kProductPathName) - 1;
+ 
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -987,7 +987,7 @@
+@@ -975,7 +975,7 @@
  
        <!-- Accessibility preferences -->
        <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR_LIMIT=32]">
 -        Accessibility
 +        Accessibility and UI
        </message>
-       <message name="IDS_FONT_SIZE" desc="Title for font size preference.">
+       <message name="IDS_FONT_SIZE_ACCESSIBILITY_LABEL" desc="Accessibility label for control to allow user to change font size.">
-         Text scaling
+         Text scaling set to <ph name="TEXT_SCALING">%1$s<ex>100%</ex></ph>
 diff --git a/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png b/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png
 index 2353496bafc8f8559a8fcbf6d609302327dc820c..9d123a8918eea5e93f6139534d7dc01a88c4278f 100644
 GIT binary patch
@@ -18853,6 +18917,126 @@ z%lwlC#@8v20MrdyXS4Cd9v0(a*!707Mi)DWKCPo$-?g#BRX!@}3RwzBwgOM1&^{Rc
 z3=3bI32q;3&^A^#@RQ;k{^t41Rq+f34W3u|*@1288y{>q;|6&;qJI})ZE0^oH1|#U
 EKU(of)Bpeg
 
+diff --git a/components/version_ui/resources/about_version.ts b/components/version_ui/resources/about_version.ts
+--- a/components/version_ui/resources/about_version.ts
++++ b/components/version_ui/resources/about_version.ts
+@@ -180,7 +180,7 @@ function initialize() {
+   // </if>
+ 
+   chrome.send('requestVersionInfo');
+-  const includeVariationsCmd = location.search.includes('show-variations-cmd');
++  const includeVariationsCmd = true;
+   sendWithPromise('requestVariationInfo', includeVariationsCmd)
+       .then(handleVariationInfo);
+   sendWithPromise('requestPathInfo').then(handlePathInfo);
+diff --git a/components/version_ui/resources/about_version_mobile.css b/components/version_ui/resources/about_version_mobile.css
+--- a/components/version_ui/resources/about_version_mobile.css
++++ b/components/version_ui/resources/about_version_mobile.css
+@@ -17,3 +17,12 @@
+   margin-left: auto;
+   margin-right: auto;
+ }
++
++tr, td {
++  display: block;
++  text-align: left !important;
++}
++
++td:last-child {
++  margin-bottom: 8px;
++}
+diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
+--- a/content/child/runtime_features.cc
++++ b/content/child/runtime_features.cc
+@@ -574,7 +574,7 @@ void ResolveInvalidConfigurations() {
+        base::FeatureList::IsEnabled(
+            features::kPrivacySandboxAdsAPIsM1Override)) &&
+       !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsFencedFramesEnabled())
++    CHECK(!WebRuntimeFeatures::IsFencedFramesEnabled())
+         << "Fenced frames cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kFencedFrames.name << " instead.";
+@@ -584,9 +584,8 @@ void ResolveInvalidConfigurations() {
+   if (!base::FeatureList::IsEnabled(blink::features::kFencedFrames) &&
+       base::FeatureList::IsEnabled(
+           blink::features::kFencedFramesLocalUnpartitionedDataAccess)) {
+-    LOG_IF(
+-        WARNING,
+-        WebRuntimeFeatures::IsFencedFramesLocalUnpartitionedDataAccessEnabled())
++    CHECK(
++        !WebRuntimeFeatures::IsFencedFramesLocalUnpartitionedDataAccessEnabled())
+         << "Fenced frames must be enabled in order to enable local "
+            "unpartitioned "
+         << "data access. Use --" << switches::kEnableFeatures << "="
+@@ -599,7 +598,7 @@ void ResolveInvalidConfigurations() {
+   // The Document API should be additionally gated by the
+   // `kBrowsingTopicsDocumentAPI` feature.
+   if (!base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsAPIEnabled())
++    CHECK(!WebRuntimeFeatures::IsTopicsAPIEnabled())
+         << "Topics cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kBrowsingTopics.name << " in addition.";
+@@ -609,7 +608,7 @@ void ResolveInvalidConfigurations() {
+   } else {
+     if (!base::FeatureList::IsEnabled(
+             blink::features::kBrowsingTopicsDocumentAPI)) {
+-      LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
++      CHECK(!WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
+           << "Topics Document API cannot be enabled in this configuration. Use "
+              "--"
+           << switches::kEnableFeatures << "="
+@@ -620,8 +619,8 @@ void ResolveInvalidConfigurations() {
+   }
+ 
+   if (!base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsSharedStorageAPIEnabled())
+-        << "SharedStorage cannot be enabled in this "
++    CHECK(!WebRuntimeFeatures::IsSharedStorageAPIEnabled())
++        << "SharedStorage for M118+ cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kSharedStorageAPI.name << " in addition.";
+@@ -630,7 +629,7 @@ void ResolveInvalidConfigurations() {
+ 
+   if (!base::FeatureList::IsEnabled(
+           attribution_reporting::features::kConversionMeasurement)) {
+-    LOG_IF(WARNING, WebRuntimeFeatures::IsAttributionReportingEnabled())
++    CHECK(!WebRuntimeFeatures::IsAttributionReportingEnabled())
+         << "AttributionReporting cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+@@ -643,8 +642,7 @@ void ResolveInvalidConfigurations() {
+           attribution_reporting::features::kConversionMeasurement) ||
+       !base::FeatureList::IsEnabled(
+           network::features::kAttributionReportingCrossAppWeb)) {
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
++    CHECK(!WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
+         << "AttributionReportingCrossAppWeb cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+@@ -655,8 +653,7 @@ void ResolveInvalidConfigurations() {
+   }
+ 
+   if (!base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
++    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
+         << "AdInterestGroupAPI cannot be enabled in this "
+            "configuration. Use --"
+         << switches::kEnableFeatures << "="
+@@ -668,8 +665,7 @@ void ResolveInvalidConfigurations() {
+   // PermissionElement cannot be enabled without the support of the
+   // browser process.
+   if (!base::FeatureList::IsEnabled(blink::features::kPermissionElement)) {
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
++    CHECK(!WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
+         << "PermissionElement cannot be enabled in this configuration. Use --"
+         << switches::kEnableFeatures << "="
+         << blink::features::kPermissionElement.name << " instead.";
 diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
 --- a/tools/grit/grit/grd_reader.py
 +++ b/tools/grit/grit/grd_reader.py
@@ -18905,14 +19089,4 @@ diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
  
  class GrdPartContentHandler(xml.sax.handler.ContentHandler):
    def __init__(self, parent):
-diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
---- a/ui/base/ui_base_features.cc
-+++ b/ui/base/ui_base_features.cc
-@@ -659,4 +659,6 @@ BASE_FEATURE(kUseGammaContrastRegistrySettings,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_WIN)
- 
-+SET_CROMITE_FEATURE_ENABLED(kChromeRefresh2023);
-+SET_CROMITE_FEATURE_ENABLED(kChromeWebuiRefresh2023);
- }  // namespace features
 --

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 {
+@@ -158,9 +158,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,14 +37,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -754,10 +754,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -777,10 +777,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
 -                            if (type == TabLaunchType.FROM_LONGPRESS_BACKGROUND
 -                                    || type == TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
--                                    || type == TabLaunchType.FROM_RECENT_TABS
+-                                    || (type == TabLaunchType.FROM_RECENT_TABS
--                                            && !DeviceClassManager.enableAnimations()) {
+-                                            && !DeviceClassManager.enableAnimations())) {
 +                            boolean selectionPopupTabsForeground =
 +                                ContextUtils.getAppSharedPreferences().getBoolean(
 +                                    "selection_popup_tabs_foreground", false);
@@ -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;
+@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
- 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;
-@@ -227,6 +228,13 @@ public class LayoutManagerImpl
+@@ -237,6 +238,13 @@ public class LayoutManagerImpl
-                                         && launchType != TabLaunchType.FROM_RECENT_TABS
+                                                 != TabLaunchType
-                                         && launchType != TabLaunchType.FROM_RESTORE_TABS_UI
+                                                         .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);
 +                boolean selectionPopupTabsForeground =
 +                            ContextUtils.getAppSharedPreferences().getBoolean(
@@ -82,35 +109,53 @@ 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
+@@ -317,8 +317,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
 @@ -27,6 +27,7 @@ import androidx.appcompat.content.res.AppCompatResources;
- 
+ import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.TraceEvent;
+ import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.ObservableSupplier;
+@@ -825,11 +826,16 @@ public class RootUiCoordinator
-@@ -841,11 +842,16 @@ public class RootUiCoordinator
+                     TrackerFactory.getTrackerForProfile(tab.getProfile())
-                             TrackerFactory.getTrackerForProfile(tab.getProfile())
+                             .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
-                                     .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  
-+                            boolean selection_popup_web_search_to_group =
++                    boolean selection_popup_web_search_to_group =
-+                                ContextUtils.getAppSharedPreferences().getBoolean(
++                        ContextUtils.getAppSharedPreferences().getBoolean(
-+                                    "selection_popup_web_search_to_group", false);
++                            "selection_popup_web_search_to_group", false);
 +
-                             mTabModelSelectorSupplier
+                     mTabModelSelectorSupplier
-                                     .get()
+                             .get()
-                                     .openNewTab(
+                             .openNewTab(
-                                             generateUrlParamsForSearch(tab, query),
+                                     generateUrlParamsForSearch(tab, query),
--                                            TabLaunchType.FROM_LONGPRESS_FOREGROUND,
+-                                    TabLaunchType.FROM_LONGPRESS_FOREGROUND,
-+                                            selection_popup_web_search_to_group ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
++                                    selection_popup_web_search_to_group ? TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP
-+                                                                                : TabLaunchType.FROM_LONGPRESS_FOREGROUND,
++                                                                        : TabLaunchType.FROM_LONGPRESS_FOREGROUND,
-                                             tab,
+                                     tab,
-                                             tab.isIncognito());
+                                     tab.isIncognito());
-                         },
+                 },
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp
 new file mode 100644
 --- /dev/null
@@ -185,15 +230,15 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
+@@ -27,6 +27,7 @@ import androidx.core.content.ContextCompat;
- 
+ import org.chromium.base.ApiCompatibilityUtils;
  import org.chromium.base.ContextUtils;
  import org.chromium.base.Log;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.PackageManagerUtils;
  import org.chromium.base.StrictModeContext;
- import org.chromium.content.R;
+ import org.chromium.build.annotations.NullMarked;
-@@ -51,38 +52,84 @@ import java.util.TreeSet;
+@@ -54,38 +55,84 @@ import java.util.TreeSet;
  public class SelectActionMenuHelper {
      private static final String TAG = "SelectActionMenu"; // 20 char limit.
  
@@ -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 {
+@@ -196,7 +243,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 {
          }
          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 {
+@@ -223,7 +270,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 {
+@@ -251,7 +298,7 @@ public class SelectActionMenuHelper {
-         // these menu items.
+         // menu items if there is selected text.
+         @IdRes int groupId = selectedText.isEmpty() ? Menu.NONE : android.R.id.textAssist;
          SelectionMenuGroup secondaryAssistItems =
-                 new SelectionMenuGroup(
+-                new SelectionMenuGroup(groupId, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
--                        android.R.id.textAssist, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
++                new SelectionMenuGroup(groupId, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
-+                        android.R.id.textAssist, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
  
-         // First action is reserved for primary action so start at index 1.
+         if (selectedText.isEmpty() && selectionActionMenuDelegate != null) {
-         final int startIndex = 1;
+             List<SelectionMenuItem> additionalMenuItems =
-@@ -335,7 +382,7 @@ public class SelectActionMenuHelper {
+@@ -313,7 +360,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;
-@@ -432,7 +479,7 @@ public class SelectActionMenuHelper {
+@@ -415,7 +462,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)
-@@ -444,7 +491,7 @@ public class SelectActionMenuHelper {
+@@ -427,7 +474,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)
-@@ -456,7 +503,7 @@ public class SelectActionMenuHelper {
+@@ -439,7 +486,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)
-@@ -470,7 +517,7 @@ public class SelectActionMenuHelper {
+@@ -453,7 +500,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)
-@@ -482,7 +529,7 @@ public class SelectActionMenuHelper {
+@@ -465,7 +512,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)
-@@ -495,7 +542,7 @@ public class SelectActionMenuHelper {
+@@ -477,7 +524,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);
-@@ -515,7 +562,7 @@ public class SelectActionMenuHelper {
+@@ -497,7 +544,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)
@@ -419,22 +455,22 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
-@@ -17,6 +17,7 @@ import org.jni_zero.CalledByNative;
+@@ -18,6 +18,7 @@ import org.jni_zero.CalledByNative;
  import org.jni_zero.JNINamespace;
  import org.jni_zero.NativeMethods;
  
 +import org.chromium.base.ContextUtils;
- import org.chromium.content_public.browser.SelectAroundCaretResult;
+ import org.chromium.base.ObserverList;
- import org.chromium.content_public.browser.SelectionClient;
+ import org.chromium.base.UserData;
- import org.chromium.content_public.browser.SelectionEventProcessor;
+ import org.chromium.build.annotations.NullMarked;
-@@ -69,6 +70,9 @@ public class SmartSelectionClient implements SelectionClient {
+@@ -86,6 +87,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
              return null;
          }
  
 +        if (!ContextUtils.getAppSharedPreferences().getBoolean(
 +                "selection_popup_smart_text", false)) return null;
 +
-         return new SmartSelectionClient(callback, webContents);
+         SmartSelectionClient client =
-     }
+                 assumeNonNull(
- 
+                         ((WebContentsImpl) webContents)
 --

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

@@ -1,24 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 5 Jun 2023 17:02:33 +0000
-Subject: Deprecate Data URL in SVGUseElement
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
----
- .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
---- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3205,8 +3205,8 @@
-       status: "stable",
-     },
-     {
--      name: "RemoveDataUrlInSvgUse",
--      status: "stable",
-+      name: "RemoveDataUrlInSvgUse",  // enabled
-+      status: "stable",               // by default
-     },
-     {
-       name: "RemoveMobileViewportDoubleTap",
---

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

@@ -10,9 +10,9 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/layout/url_bar.xml    |  1 +
- .../browser/omnibox/LocationBarMediator.java  | 13 +++++++++--
+ .../browser/omnibox/LocationBarMediator.java  | 13 ++++++++--
- .../chrome/browser/omnibox/UrlBar.java        | 23 +++++++++++++++++++
+ .../chrome/browser/omnibox/UrlBar.java        | 24 +++++++++++++++++++
- 3 files changed, 35 insertions(+), 2 deletions(-)
+ 3 files changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
 --- a/chrome/android/java/res/layout/url_bar.xml
@@ -27,10 +27,10 @@ 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
-@@ -291,8 +291,17 @@ class LocationBarMediator
+@@ -292,8 +292,17 @@ class LocationBarMediator
-             if (mNativeInitialized) RecordUserAction.record("FocusLocation");
+             if (!mUrlFocusedWithPastedText
-             // Don't clear Omnibox if the user just pasted text to NTP Omnibox.
+                     && !shouldRetainOmniboxOnFocus
-             if (mShouldClearOmniboxOnFocus) {
+                     && mLocationBarLayout.shouldClearTextOnFocus()) {
 -                setUrlBarText(
 -                        UrlBarData.EMPTY, UrlBar.ScrollType.NO_SCROLL, SelectionState.SELECT_END);
 +                UrlBarData data = mLocationBarDataProvider.getUrlBarData();
@@ -44,9 +44,9 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +                    }
 +                }
 +                setUrlBarText(data, UrlBar.ScrollType.NO_SCROLL, selectionState);
+             } else if (shouldRetainOmniboxOnFocus) {
+                 mUrlCoordinator.setSelectAllOnFocus(true);
              }
-         } else {
-             mUrlFocusedFromFakebox = false;
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -58,18 +58,19 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import android.os.SystemClock;
  import android.text.Editable;
  import android.text.InputType;
-@@ -99,6 +100,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -107,6 +108,7 @@ public class UrlBar extends AutocompleteEditText {
-     private boolean mFocused;
      private boolean mAllowFocus = true;
+     private boolean mShouldSendTypingStartedEvent;
  
 +    private boolean mPendingSelectAll;
      private boolean mPendingScroll;
  
      // Captures the current intended text scroll type.
-@@ -294,6 +296,27 @@ public abstract class UrlBar extends AutocompleteEditText {
+@@ -332,6 +334,28 @@ public class UrlBar extends AutocompleteEditText {
-             mPendingScroll = false;
-         }
          fixupTextDirection();
+ 
+         mShouldSendTypingStartedEvent = focused;
++
 +        if (mPendingSelectAll) {
 +            UrlBar sender = this;
 +            new Handler().post(new Runnable() {

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.
+@@ -8,6 +8,11 @@ found in the LICENSE file.
- 
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+                   xmlns:app="http://schemas.android.com/apk/res-auto">
  
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="enable_accessibility"
 +        android:summary="@string/enable_accessibility_summary"
 +        android:title="@string/enable_accessibility_title" />
 +
-     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
+     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
-         android:key="text_scale"
+         android:key="page_zoom_default_zoom"
-         android:title="@string/font_size"
+         android:selectable="false" />
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1039,6 +1039,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1095,6 +1095,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

build/patches/Disable-Android-AppRestrictions.patch

@@ -40,7 +40,7 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
  
  import java.util.LinkedList;
  import java.util.Queue;
-@@ -76,6 +77,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
+@@ -104,6 +105,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
              new AsyncTask<OwnedState>() {
                  // TODO: Unit test this function. https://crbug.com/1099262
                  private OwnedState calculateIsRunningOnManagedProfile(Context context) {
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -25,6 +25,7 @@ android_library("java") {
+@@ -26,6 +26,7 @@ android_library("java") {
      "//build:chromeos_buildflags",
      "//build/android:build_java",
      "//chrome/browser/preferences:java",
@@ -86,7 +86,7 @@ new file mode 100644
 +
 +package org.chromium.chrome.browser.flags.cromite;
 +
-+import org.chromium.base.cached_flags.CachedFlag;
++import org.chromium.components.cached_flags.CachedFlag;
 +import org.chromium.chrome.browser.flags.ChromeFeatureMap;
 +import org.chromium.components.policy.AppRestrictionsProvider;
 +

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

build/patches/Disable-Component-Updates.patch

@@ -1,46 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 8 Nov 2022 12:41:22 +0000
-Subject: Disable Component Updates
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
----
- chrome/browser/component_updater/registration.cc          | 1 +
- components/component_updater/component_installer.cc       | 1 +
- components/component_updater/component_updater_service.cc | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
---- a/chrome/browser/component_updater/registration.cc
-+++ b/chrome/browser/component_updater/registration.cc
-@@ -99,6 +99,7 @@
- namespace component_updater {
- 
- void RegisterComponentsForUpdate() {
-+  if ((true)) return;
-   auto* const cus = g_browser_process->component_updater();
- 
- #if BUILDFLAG(IS_WIN)
-diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc
---- a/components/component_updater/component_installer.cc
-+++ b/components/component_updater/component_installer.cc
-@@ -99,6 +99,7 @@ void ComponentInstaller::Register(
-     base::OnceClosure callback,
-     const base::Version& registered_version,
-     const base::Version& max_previous_product_version) {
-+  if ((true)) return;
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-   if (!installer_policy_) {
-diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
---- a/components/component_updater/component_updater_service.cc
-+++ b/components/component_updater/component_updater_service.cc
-@@ -539,7 +539,7 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
- // Register prefs required by the component update service.
- void RegisterComponentUpdateServicePrefs(PrefRegistrySimple* registry) {
-   // The component updates are enabled by default, if the preference is not set.
--  registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, false);
- }
- 
- }  // namespace component_updater
---

build/patches/Disable-Compose-feature.patch

@@ -4,31 +4,63 @@ Subject: Disable Compose feature
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/extensions/api/settings_private/prefs_util.cc | 2 ++
+ chrome/browser/BUILD.gn                             | 9 +++++++--
- components/compose/core/browser/compose_features.cc          | 2 ++
+ chrome/browser/ui/webui/settings/settings_ui.cc     | 2 +-
- components/compose/features.gni                              | 2 +-
+ components/compose/core/browser/compose_features.cc | 2 ++
- 3 files changed, 5 insertions(+), 1 deletion(-)
+ components/compose/features.gni                     | 2 +-
+ 4 files changed, 11 insertions(+), 4 deletions(-)
 
-diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
---- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
++++ b/chrome/browser/BUILD.gn
-@@ -483,8 +483,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -8383,6 +8383,12 @@ static_library("browser") {
-   (*s_allowlist)
+     deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
-       [::permissions::prefs::kUnusedSitePermissionsRevocationEnabled] =
+   }
-           settings_api::PrefType::kBoolean;
-+#if BUILDFLAG(ENABLE_COMPOSE)
-   (*s_allowlist)[prefs::kEnableProactiveNudge] =
-       settings_api::PrefType::kBoolean;
-+#endif
  
-   // Clear browsing data settings.
++  if (!is_android) {
-   (*s_allowlist)[browsing_data::prefs::kDeleteBrowsingHistory] =
++    deps += [
++      ":compose_optimization_guide_proto",
++    ]
++  }
++
+   if (enable_compose) {
+     sources += [
+       "compose/chrome_compose_client.cc",
+@@ -8398,7 +8404,6 @@ static_library("browser") {
+     ]
+ 
+     deps += [
+-      ":compose_optimization_guide_proto",
+       "//chrome/common/compose",
+       "//chrome/common/compose:mojo_bindings",
+       "//components/autofill/content/browser:browser",
+@@ -8845,7 +8850,7 @@ source_set("font_pref") {
+   deps = [ "//chrome/common" ]
+ }
+ 
+-if (enable_compose) {
++if (!is_android) {
+   proto_library("compose_optimization_guide_proto") {
+     sources = [ "compose/proto/compose_optimization_guide.proto" ]
+     cc_generator_options = "lite=true:"
+diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
+--- a/chrome/browser/ui/webui/settings/settings_ui.cc
++++ b/chrome/browser/ui/webui/settings/settings_ui.cc
+@@ -378,7 +378,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+       base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
+ 
+ #if BUILDFLAG(ENABLE_COMPOSE)
+-  const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile);
++  const bool compose_enabled = false;
+   const bool compose_visible = ComposeEnabling::IsSettingVisible(profile);
+ #else
+   const bool compose_enabled = false;
 diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc
 --- a/components/compose/core/browser/compose_features.cc
 +++ b/components/compose/core/browser/compose_features.cc
-@@ -73,4 +73,6 @@ BASE_FEATURE(kEnableNudgeForUnspecifiedHint,
+@@ -104,4 +104,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
-              "ComposeEnableNudgeForUnspecifiedHint",
+              "ComposeUpfrontInputModes",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
 +SET_CROMITE_FEATURE_DISABLED(kComposeEligible);

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

@@ -10,25 +10,21 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -677,16 +677,18 @@
+@@ -874,12 +874,14 @@
        }
      },
      {
 -      name: "CompressionDictionaryTransport",
 +      name: "CompressionDictionaryTransport", // need to be disabled
-       base_feature: "none",
-       origin_trial_feature_name: "CompressionDictionaryTransportV2",
-       origin_trial_allows_third_party: true,
-       public: true,
 +      status: "experimental",
+       base_feature: "none",
+       public: true,
      },
      {
 -      name: "CompressionDictionaryTransportBackend",
 +      name: "CompressionDictionaryTransportBackend", // need to be disabled
++      status: "experimental",
        base_feature: "none",
        public: true,
-+      status: "experimental",
      },
-     {
-       name: "ComputedAccessibilityInfo",
 --

build/patches/Disable-FedCm.patch

@@ -4,22 +4,29 @@ 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 | 2 ++
+ .../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, 3 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
 --- /dev/null
 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
-@@ -0,0 +1,2 @@
+@@ -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
-@@ -1559,7 +1559,7 @@
+@@ -1780,7 +1780,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,90 +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
-@@ -419,7 +419,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
-@@ -48,7 +48,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kPrivacySandboxFirstPartySetsDataAccessAllowedInitialized, false);
-   registry->RegisterBooleanPref(
--      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, true,
-+      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, false,  // must be disabled
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- 
-   registry->RegisterBooleanPref(prefs::kPrivacySandboxTopicsConsentGiven,
-diff --git a/components/privacy_sandbox/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,14 +64,14 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
- 
-   // Tracking Protection Settings Prefs
-   registry->RegisterBooleanPref(
--      prefs::kBlockAll3pcToggleEnabled, false,
-+      prefs::kBlockAll3pcToggleEnabled, false, // with true enables FPS
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(prefs::kAllowAll3pcToggleEnabled, false);
-   registry->RegisterIntegerPref(
-       prefs::kTrackingProtectionLevel,
-       static_cast<int>(TrackingProtectionLevel::kStandard),
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
--  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false);
-+  registry->RegisterBooleanPref(prefs::kTrackingProtection3pcdEnabled, false); // with true enables FPS
-   registry->RegisterBooleanPref(
-       prefs::kIpProtectionEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
---

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

@@ -4,34 +4,38 @@ 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 -----
+ .../chrome/browser/IntentHandler.java         |  6 ------
- .../chromium/chrome/browser/share/LensUtils.java   | 14 ++------------
+ .../provider/PageContentProviderImpl.java     |  6 ------
- .../org/chromium/chrome/browser/gsa/GSAState.java  | 11 +++++------
+ .../chrome/browser/share/LensUtils.java       | 14 ++------------
- .../Disable-GSA-by-default.inc                     |  1 +
+ .../chromium/chrome/browser/gsa/GSAUtils.java | 10 +++-------
- 4 files changed, 8 insertions(+), 23 deletions(-)
+ .../GoogleBottomBarActionsHandler.java        | 19 ++-----------------
+ .../chrome/browser/pdf/PdfCoordinator.java    |  4 +---
+ .../Disable-GSA-by-default.inc                |  1 +
+ 7 files changed, 9 insertions(+), 51 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
 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
-@@ -39,7 +39,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
--import org.chromium.chrome.browser.gsa.GSAState;
+-import org.chromium.chrome.browser.gsa.GSAUtils;
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -258,8 +257,6 @@ public class IntentHandler {
+@@ -263,9 +262,6 @@ public class IntentHandler {
+     public static final String EXTRA_SKIP_PRECONNECT =
+             "org.chromium.chrome.browser.skip_preconnect";
+ 
+-    /** The package name for the Google Search App. */
+-    public static final String PACKAGE_GSA = GSAUtils.GSA_PACKAGE_NAME;
+-
+     private static Pair<Integer, String> sPendingReferrer;
      private static int sReferrerId;
      private static String sPendingIncognitoUrl;
- 
+@@ -539,8 +535,6 @@ public class IntentHandler {
--    public static final String PACKAGE_GSA = GSAState.PACKAGE_NAME;
--
-     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";
-@@ -475,8 +472,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -40,6 +44,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
          } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) {
              return ExternalAppId.CHROME;
          } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
+@@ -56,8 +56,6 @@ import java.util.UUID;
+ public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
+ 
+     private static final int INVALIDATE_URI_DELAY_MS = 10_000;
+-    private static final String[] AUTHORIZED_PACKAGE_NAMES =
+-            new String[] {GSAUtils.GSA_PACKAGE_NAME};
+ 
+     static final class PageContentInvocationState {
+ 
+@@ -339,10 +337,6 @@ public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
+     }
+ 
+     private static void grantAccessToUri(Uri uri) {
+-        for (String packageName : AUTHORIZED_PACKAGE_NAMES) {
+-            ContextUtils.getApplicationContext()
+-                    .grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+-        }
+     }
+ 
+     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
@@ -47,15 +74,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
  import org.chromium.base.ResettersForTesting;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
--import org.chromium.chrome.browser.gsa.GSAState;
+-import org.chromium.chrome.browser.gsa.GSAUtils;
  import org.chromium.components.externalauth.ExternalAuthUtils;
  
  /** This class provides utilities for intenting into Google Lens. */
-@@ -54,12 +53,7 @@ public class LensUtils {
+@@ -49,12 +48,7 @@ public class LensUtils {
              if (context == null) {
                  return "";
              }
--            String agsaVersion = GSAState.getInstance().getAgsaVersionName();
+-            String agsaVersion = GSAUtils.getAgsaVersionName();
 -            if (agsaVersion == null) {
                  return "";
 -            } else {
@@ -64,15 +91,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
          }
      }
  
-@@ -98,15 +92,11 @@ public class LensUtils {
+@@ -92,15 +86,11 @@ public class LensUtils {
       * @return Whether the package is valid.
       */
-     public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) {
+     public static boolean isValidAgsaPackage() {
 -        if (sFakePassableLensEnvironmentForTesting) {
 -            return true;
 -        }
 -
--        return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA);
+-        return ExternalAuthUtils.getInstance().isGoogleSigned(IntentHandler.PACKAGE_GSA);
 +        return false;
      }
  
@@ -82,62 +109,121 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
      }
  
      public static boolean shouldLogUkmForLensContextMenuFeatures() {
-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
+diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
---- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java
+--- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
-+++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAState.java
++++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
-@@ -31,8 +31,6 @@ import java.util.regex.Pattern;
+@@ -13,16 +13,11 @@ import org.chromium.base.PackageUtils;
  
- /** A class responsible for representing the current state of Chrome's integration with GSA. */
+ /** This class provides utilities for the state of Google Search App. */
- public class GSAState {
+ public class GSAUtils {
--    public static final String PACKAGE_NAME = "com.google.android.googlequicksearchbox";
+-    public static final String GSA_PACKAGE_NAME = "com.google.android.googlequicksearchbox";
+-    public static final String GSA_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 {
-     private final ObserverList<Observer> mObserverList = new ObserverList<>();
- 
-     /** Caches the result of a computation on whether GSA is available. */
--    private Boolean mGsaAvailable;
-+    private Boolean mGsaAvailable = false;
- 
      /**
-      * The Google account email address being used by GSA according to the latest update we have
+      * @return Whether the given package name is the package name for Google Search App.
-@@ -152,7 +150,7 @@ public class GSAState {
+      */
- 
+     public static boolean isGsaPackageName(String packageName) {
-     /** Returns whether the GSA package is installed on device. */
+-        return GSA_PACKAGE_NAME.equals(packageName);
-     public boolean isGsaInstalled() {
--        return PackageUtils.isPackageInstalled(PACKAGE_NAME);
 +        return false;
      }
  
      /**
-@@ -175,6 +173,7 @@ public class GSAState {
+@@ -34,6 +29,7 @@ public class GSAUtils {
       */
-     public boolean isAgsaVersionBelowMinimum(
+     public static boolean isAgsaVersionBelowMinimum(
              String installedVersionName, String minimumVersionName) {
 +        if ((true)) return false;
          if (TextUtils.isEmpty(installedVersionName) || TextUtils.isEmpty(minimumVersionName)) {
              return true;
          }
-@@ -206,7 +205,7 @@ public class GSAState {
+@@ -64,7 +60,7 @@ public class GSAUtils {
-      * @return Whether the given intent can be handled by Agsa.
-      */
-     public boolean canAgsaHandleIntent(@NonNull Intent intent) {
--        if (!intent.getPackage().equals(PACKAGE_NAME)) return false;
-+        if ((true)) return false;
- 
-         ComponentName activity =
-                 intent.resolveActivity(ContextUtils.getApplicationContext().getPackageManager());
-@@ -220,7 +219,7 @@ public class GSAState {
       * @return The version name of the Agsa package or null if it can't be found.
       */
-     public @Nullable String getAgsaVersionName() {
+     public static @Nullable String getAgsaVersionName() {
--        PackageInfo packageInfo = PackageUtils.getPackageInfo(PACKAGE_NAME, 0);
+-        PackageInfo packageInfo = PackageUtils.getPackageInfo(GSA_PACKAGE_NAME, 0);
 +        PackageInfo packageInfo = null;
          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.GSAUtils.GSA_CLASS_NAME;
+-import static org.chromium.chrome.browser.gsa.GSAUtils.GSA_PACKAGE_NAME;
+-import static org.chromium.chrome.browser.gsa.GSAUtils.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(GSA_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(GSA_PACKAGE_NAME);
+-
+-        startGoogleAppActivityForResult(intent, "openGoogleAppSearch");
+     }
+ 
+     private void openGoogleAppHome() {
+-        Intent intent = new Intent(Intent.ACTION_MAIN);
+-        intent.addCategory(Intent.CATEGORY_INFO);
+-        intent.setClassName(GSA_PACKAGE_NAME, GSA_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/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
+--- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
++++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
+@@ -246,7 +246,7 @@ public class PdfCoordinator {
+     }
+ 
+     String requestAssistContent(String filename, boolean isWorkProfile) {
+-        if (mUri == null) {
++        if ((true)) {
+             return null;
+         }
+         String structuredData;
+@@ -264,8 +264,6 @@ public class PdfCoordinator {
+         } catch (JSONException e) {
+             return null;
+         }
+-        mActivity.grantUriPermission(
+-                GSAUtils.GSA_PACKAGE_NAME, mUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+         PdfUtils.recordIsWorkProfile(isWorkProfile);
+         return structuredData;
+     }
 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 +
+ .../components/installedapp/InstalledAppProviderImpl.java  | 1 +
- content/browser/installedapp/installed_app_provider_impl_win.cc | 1 +
+ .../browser/installedapp/installed_app_provider_impl.cc    | 2 +-
- .../content_features_cc/Disable-GetInstalledRelatedApps-API.inc | 2 ++
+ .../features_cc/Disable-GetInstalledRelatedApps-API.inc    | 7 +++++++
- .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
+ .../Disable-GetInstalledRelatedApps-API.inc                | 2 ++
- 4 files changed, 5 insertions(+), 1 deletion(-)
+ .../blink/renderer/platform/runtime_enabled_features.json5 | 3 +--
+ 5 files changed, 12 insertions(+), 3 deletions(-)
+ create mode 100644 cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
 
 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
@@ -21,18 +23,31 @@ diff --git a/components/installedapp/android/java/src/org/chromium/components/in
 +        assert false;
          GURL url = mRenderFrameHost.getLastCommittedURL();
          final GURL frameUrl = url == null ? GURL.emptyGURL() : url;
-         int delayMillis = 0;
+         int numTasks = Math.min(relatedApps.length, MAX_ALLOWED_RELATED_APPS);
-diff --git a/content/browser/installedapp/installed_app_provider_impl_win.cc b/content/browser/installedapp/installed_app_provider_impl_win.cc
+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_win.cc
+--- a/content/browser/installedapp/installed_app_provider_impl.cc
-+++ b/content/browser/installedapp/installed_app_provider_impl_win.cc
++++ b/content/browser/installedapp/installed_app_provider_impl.cc
-@@ -112,6 +112,7 @@ void FilterInstalledAppsForWin(
+@@ -59,7 +59,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
-     std::vector<blink::mojom::RelatedApplicationPtr> related_apps,
+     const GURL& manifest_url,
-     blink::mojom::InstalledAppProvider::FilterInstalledAppsCallback callback,
+     FilterInstalledAppsCallback callback) {
-     const GURL frame_url) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+  CHECK(true);
+-  if (!base::FeatureList::IsEnabled(features::kInstalledAppProvider)) {
-   ComPtr<IUriRuntimeClassFactory> url_factory;
++  if ((true)) {
-   HRESULT hr =
+     base::SequencedTaskRunner::GetCurrentDefault()->PostTask(
-       base::win::GetActivationFactory<IUriRuntimeClassFactory,
+         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,12 +58,12 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2166,9 +2166,9 @@
+@@ -2499,9 +2499,8 @@
-       status: {"Android": "test", "default": "stable"},
+       name: "InspectorGhostRules",
      },
      {
-+      // disable GetInstalledRelatedApps
+-      name: "InstalledApp",
-       name: "InstalledApp",
++      name: "InstalledApp", // disable GetInstalledRelatedApps
        public: true,
 -      status: "stable",
        base_feature: "none",

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 {
+@@ -107,7 +107,7 @@ public class StartupPaintPreviewHelper {
-      * feature is not enabled this is effectively a no-op.
+ 
-      */
+     /** Enables Paint Preview show attempt on restoration of a tab. */
-     public static void setShouldShowOnRestore(boolean shouldShowOnRestore) {
+     public static void enableShowOnRestore() {
--        sShouldShowOnRestore = shouldShowOnRestore;
+-        sShouldShowOnRestore = true;
 +        sShouldShowOnRestore = false;
      }
  

build/patches/Disable-Posture-API.patch

@@ -0,0 +1,22 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 20 Jan 2025 16:54:03 +0000
+Subject: Disable Posture API
+
+see https://issues.chromium.org/issues/40124716
+and https://github.com/w3c/device-posture/blob/gh-pages/security-privacy-self-assessment.md
+---
+ .../browser/device_posture/device_posture_platform_provider.cc   | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/content/browser/device_posture/device_posture_platform_provider.cc b/content/browser/device_posture/device_posture_platform_provider.cc
+--- a/content/browser/device_posture/device_posture_platform_provider.cc
++++ b/content/browser/device_posture/device_posture_platform_provider.cc
+@@ -18,6 +18,7 @@ namespace content {
+ // static
+ std::unique_ptr<DevicePosturePlatformProvider>
+ DevicePosturePlatformProvider::Create(WebContents* web_contents) {
++  if ((true)) return std::make_unique<DevicePosturePlatformProviderDefault>();
+ #if BUILDFLAG(IS_WIN)
+   return std::make_unique<DevicePosturePlatformProviderWin>();
+ #elif BUILDFLAG(IS_ANDROID)
+--

build/patches/Disable-PrivacyGuide.patch

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

build/patches/Disable-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

@@ -5,15 +5,15 @@ 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/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(+), 9 deletions(-)
+ 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
-@@ -2159,7 +2159,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2395,7 +2395,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,22 +25,25 @@ 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
-@@ -423,11 +423,6 @@
+@@ -19,14 +19,6 @@
-       hidden$="[[!logoEnabled_]]">
+       ?hidden="${!this.logoEnabled_}">
    </ntp-logo>
-   <div id="realboxContainer">
+   <div id="searchboxContainer">
--    <cr-realbox id="realbox" is-dark="[[theme_.isDark]]"
+-    <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
--        color-source-is-baseline="[[colorSourceIsBaseline]]"
+-        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
--        on-open-lens-search="onOpenLensSearch_"
+-        @open-lens-search="${this.onOpenLensSearch_}"
--        on-open-voice-search="onOpenVoiceSearch_" shown$="[[realboxShown_]]">
+-        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
--    </cr-realbox>
+-        ?had-secondary-side="${this.realboxHadSecondarySide}"
-     <template is="dom-if" if="[[showLensUploadDialog_]]" restamp>
+-        @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_">
+           @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
-@@ -451,6 +451,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+@@ -420,6 +420,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                              Profile* profile,
                                              bool enable_voice_search,
                                              bool enable_lens_search) {
@@ -51,18 +54,18 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -176,7 +176,7 @@ BASE_FEATURE(kNtpHandleMostVisitedNavigationExplicitly,
+@@ -121,7 +121,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
-              base::FEATURE_ENABLED_BY_DEFAULT);
  
  // 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.
+ // If enabled, middle slot promo will be shown.
- BASE_FEATURE(kNtpReducedLogoSpace,
+ // This is a kill switch. Keep indefinitely.
-@@ -253,8 +253,8 @@ BASE_FEATURE(kNtpMostVisitedReflowOnOverflow,
+@@ -179,8 +179,8 @@ BASE_FEATURE(kNtpModulesLoad,
- 
  // If enabled, OneGoogleBar will be shown.
+ // This is a kill switch. Keep indefinitely.
  BASE_FEATURE(kNtpOneGoogleBar,
 -             "NtpOneGoogleBar",
 -             base::FEATURE_ENABLED_BY_DEFAULT);

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
-@@ -648,7 +648,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 sStartSurfaceReturnTime =
-             newCachedFlag(START_SURFACE_RETURN_TIME, true);
-     public static final CachedFlag sStopAppIndexingReport =
-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,9 +79,9 @@ new file mode 100644
 diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 --- a/net/http/http_network_session.cc
 +++ b/net/http/http_network_session.cc
-@@ -209,6 +209,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
+@@ -223,6 +223,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
  
-   next_protos_.push_back(kProtoHTTP11);
+   next_protos_.push_back(NextProto::kProtoHTTP11);
  
 +  DCHECK(context.quic_context->params()->max_server_configs_stored_in_properties == 0);
    http_server_properties_->SetMaxServerConfigsStoredInProperties(
@@ -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
-@@ -77,6 +77,7 @@
+@@ -84,6 +84,7 @@
  #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
  #include "net/traffic_annotation/network_traffic_annotation.h"
  #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -196,6 +197,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log,
+@@ -332,6 +333,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
  
  }  // 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() {
-@@ -1894,7 +1927,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -2229,7 +2262,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
-@@ -288,7 +288,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -284,7 +284,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
    CHECK(context_);
  }
  
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -672,6 +698,8 @@ int SSLClientSocketImpl::Init() {
+@@ -671,6 +697,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -191,8 +191,8 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +      Log_ssl_session_data("Old session resumed", session.get());
    }
  
-   const int kBufferSize = GetDefaultOpenSSLBufferSize();
+   transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -959,6 +987,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -957,6 +985,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -227,8 +227,8 @@ 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.
+   // Measure TLS connections that implement the renegotiation_info and EMS
-@@ -1584,6 +1641,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1588,6 +1645,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -240,7 +240,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
 --- a/net/socket/ssl_client_socket_impl.h
 +++ b/net/socket/ssl_client_socket_impl.h
-@@ -125,6 +125,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
+@@ -123,6 +123,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
    friend class SSLClientSocket;
    friend class SSLContext;
  

build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch

@@ -0,0 +1,39 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 24 Jan 2025 14:32:14 +0000
+Subject: Disable Web Bluetooth by default in desktop platforms
+
+On desktop platforms, disable Bluetooth by default and activate the user-manageable content setting ui.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../core/browser/content_settings_registry.cc                | 5 +++++
+ .../content_features_cc/Disable-Web-Bluetooth-by-default.inc | 3 +++
+ 2 files changed, 8 insertions(+)
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-Web-Bluetooth-by-default.inc
+
+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
+@@ -371,8 +371,13 @@ void ContentSettingsRegistry::Init() {
+            ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
+ 
++#if BUILDFLAG(IS_ANDROID)
+   Register(ContentSettingsType::BLUETOOTH_GUARD, "bluetooth-guard",
+            CONTENT_SETTING_ASK, WebsiteSettingsInfo::UNSYNCABLE,
++#else
++  Register(ContentSettingsType::BLUETOOTH_GUARD, "bluetooth-guard2",
++           CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::UNSYNCABLE,
++#endif
+            /*allowlisted_primary_schemes=*/{},
+            /*valid_settings=*/{CONTENT_SETTING_ASK, CONTENT_SETTING_BLOCK},
+            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-Web-Bluetooth-by-default.inc b/cromite_flags/content/public/common/content_features_cc/Disable-Web-Bluetooth-by-default.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/content/public/common/content_features_cc/Disable-Web-Bluetooth-by-default.inc
+@@ -0,0 +1,3 @@
++#if !BUILDFLAG(IS_ANDROID)
++SET_CROMITE_FEATURE_ENABLED(kWebBluetoothNewPermissionsBackend);
++#endif
+--