2025-04-04 22:33:38 +03:00
37972 changed files with 3604797 additions and 3676856 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,33 +0,0 @@
-branches:
-  except:
-    - dev
-version: '{build}'
-image: Visual Studio 2017
-install:
-  - cinst ninja
-cache:
-  - '%USERPROFILE%\.cargo\bin'
-  - '%LOCALAPPDATA%\Mozilla\sccache'
-build_script:
-  - bash ./tools/import-upstream.sh
-  - bash -c 'cd src; ./get-clang.sh'
-  - bash -c '~/.cargo/bin/sccache -s'
-  - bash -c 'cd src; ./build.sh'
-  - bash -c '~/.cargo/bin/sccache -s'
-  - ps: $env:BUILD_NAME="naiveproxy-$env:APPVEYOR_REPO_TAG_NAME-win64"
-  - bash -c 'mkdir $BUILD_NAME'
-  - bash -c 'cp src/out/Release/naive.exe src/config.json LICENSE USAGE.txt $BUILD_NAME'
-  - bash -c '7z a $BUILD_NAME.zip $BUILD_NAME'
-test_script:
-  - bash -c './tests/basic.sh src/out/Release/naive'
-artifacts:
-  - path: $(BUILD_NAME).zip
-deploy:
-  - provider: GitHub
-    auth_token:
-      secure: h+qwIoof/3ET7LOldWwlb6XQLmpxYPuaZL4YcFQ8QyclfBrnywzwzDaSqdE2unPg
-    artifact: $(BUILD_NAME).zip
-    prerelease: true
-    force_update: true
-    on:
-      APPVEYOR_REPO_TAG: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,573 @@
+name: Build
+on:
+  push:
+    branches: [master]
+    paths-ignore: [README.md]
+  release:
+    types: [published]
+defaults:
+  run:
+    shell: bash
+    working-directory: src
+env:
+  CACHE_EPOCH: 1
+  CCACHE_MAXSIZE: 200M
+  CCACHE_MAXFILES: 0
+  SCCACHE_CACHE_SIZE: 200M
+jobs:
+  cache-toolchains-posix:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains (Linux, OpenWrt, Android)
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            src/qemu-user-static*.deb
+          key: toolchains-posix-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (Linux, OpenWrt)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/
+          key: pgo-linux-openwrt-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache AFDO (Android)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/android/profiles/
+          key: afdo-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache Android NDK (Android)
+        uses: actions/cache@v4
+        with:
+          path: src/third_party/android_toolchain/ndk/
+          key: android-ndk-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - run: ./get-clang.sh
+      - run: EXTRA_FLAGS='target_os="android"' ./get-clang.sh
+      - run: |
+          if [ ! -f qemu-user-static*.deb ]; then
+            wget https://snapshot.debian.org/archive/debian/20230611T210420Z/pool/main/q/qemu/qemu-user-static_8.0%2Bdfsg-4_amd64.deb
+          fi
+  cache-toolchains-win:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            ~/.cargo/bin/
+            ~/bin/ninja.exe
+          key: toolchains-win-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (win64)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/chrome-win64-*
+          key: pgo-win64-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (win32)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/chrome-win32-*
+          key: pgo-win32-arm64-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - run: EXTRA_FLAGS='target_cpu="x64"' ./get-clang.sh
+      - run: EXTRA_FLAGS='target_cpu="x86"' ./get-clang.sh
+      - run: |
+          if [ ! -f ~/bin/ninja.exe ]; then
+            curl -LO https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip
+            unzip ninja-win.zip -d ~/bin
+          fi
+  cache-toolchains-mac:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/chrome/build/pgo_profiles/chrome-mac-*
+            src/gn/
+          key: toolchains-pgo-mac-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - run: EXTRA_FLAGS='target_cpu="x64"' ./get-clang.sh
+      - run: EXTRA_FLAGS='target_cpu="arm64"' ./get-clang.sh
+  linux:
+    needs: cache-toolchains-posix
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x64, x86, arm64, arm, mipsel, mips64el, riscv64]
+    env:
+      EXTRA_FLAGS: 'target_cpu="${{ matrix.arch }}"'
+      BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains (Linux, OpenWrt, Android)
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            src/qemu-user-static*.deb
+          key: toolchains-posix-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (Linux, OpenWrt)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/
+          key: pgo-linux-openwrt-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Regenerate Debian keyring
+        run: |
+          rm -f ./build/linux/sysroot_scripts/keyring.gpg
+          GPG_TTY=/dev/null ./build/linux/sysroot_scripts/generate_keyring.sh
+      - name: Cache sysroot
+        uses: actions/cache@v4
+        with:
+          path: src/out/sysroot-build/bullseye/bullseye_*
+          key: sysroot-linux-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - id: ccache-timestamp
+        run: echo "CCACHE_TIMESTAMP=$(date +%s)" >>$GITHUB_OUTPUT
+      - name: Cache ccache files
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ccache
+          key: ccache-linux-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-${{ steps.ccache-timestamp.outputs.CCACHE_TIMESTAMP }}
+          restore-keys: ccache-linux-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-
+      - name: Install APT packages
+        run: |
+          sudo apt update
+          sudo apt install ninja-build pkg-config ccache bubblewrap
+          sudo apt remove -y qemu-user-binfmt
+          sudo dpkg -i qemu-user-static*.deb
+          # libc6-i386 interferes with x86 build
+          sudo apt remove libc6-i386
+      - run: ./get-clang.sh
+      - run: ccache -z
+      - run: ./build.sh
+      - run: ccache -s
+      - run: ../tests/basic.sh out/Release/naive
+      - name: Pack naiveproxy assets
+        run: |
+          mkdir ${{ env.BUNDLE }}
+          cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }}
+          tar cJf ${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }}
+          openssl sha256 out/Release/naive >sha256sum.txt
+          echo "SHA256SUM=$(cut -d' ' -f2 sha256sum.txt)" >>$GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BUNDLE }}.tar.xz naive executable sha256 ${{ env.SHA256SUM }}
+          path: src/sha256sum.txt
+      - name: Upload naiveproxy assets
+        if: ${{ github.event_name == 'release' }}
+        run: gh release upload "${GITHUB_REF##*/}" ${{ env.BUNDLE }}.tar.xz --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  android:
+    needs: cache-toolchains-posix
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: x64
+            abi: x86_64
+          - arch: x86
+            abi: x86
+          - arch: arm64
+            abi: arm64-v8a
+          - arch: arm
+            abi: armeabi-v7a
+    env:
+      EXTRA_FLAGS: 'target_cpu="${{ matrix.arch }}" target_os="android"'
+      BUNDLE: naiveproxy-plugin-${{ github.event.release.tag_name || 'v1.1.1.1-1' }}-${{ matrix.abi }}.apk
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Cache toolchains (Linux, OpenWrt, Android)
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            src/qemu-user-static*.deb
+          key: toolchains-posix-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache AFDO (Android)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/android/profiles/
+          key: afdo-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache Android NDK (Android)
+        uses: actions/cache@v4
+        with:
+          path: src/third_party/android_toolchain/ndk/
+          key: android-ndk-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache sysroot
+        uses: actions/cache@v4
+        with:
+          path: src/out/sysroot-build/android/
+          key: sysroot-android-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - id: ccache-timestamp
+        run: echo "CCACHE_TIMESTAMP=$(date +%s)" >>$GITHUB_OUTPUT
+      - name: Cache ccache files
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ccache
+          key: ccache-android-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-${{ steps.ccache-timestamp.outputs.CCACHE_TIMESTAMP }}
+          restore-keys: ccache-android-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-
+      - name: Install APT packages
+        run: |
+          sudo apt update
+          sudo apt install ninja-build pkg-config ccache bubblewrap
+          sudo apt remove -y qemu-user-binfmt
+          sudo dpkg -i qemu-user-static*.deb
+          # libc6-i386 interferes with x86 build
+          sudo apt remove libc6-i386
+      - run: ./get-clang.sh
+      - run: ccache -z
+      - run: ./build.sh
+      - run: ccache -s
+      - run: ./get-android-sys.sh
+      - run: ../tests/basic.sh out/Release/naive
+      - name: Gradle cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle
+          key: gradle-${{ hashFiles('**/*.gradle.kts') }}
+      - name: Create APK
+        working-directory: apk
+        env:
+          APK_ABI: ${{ matrix.abi }}
+          APK_VERSION_NAME: ${{ github.event.release.tag_name || 'v1.1.1.1-1' }}
+          KEYSTORE_PASS: ${{ secrets.KEYSTORE_PASS }}
+        run: |
+          mkdir -p app/libs/$APK_ABI
+          cp ../src/out/Release/naive app/libs/$APK_ABI/libnaive.so
+          ./gradlew :app:assembleRelease
+          openssl sha256 app/build/outputs/apk/release/${{ env.BUNDLE }} >sha256sum.txt
+          echo "SHA256SUM=$(cut -d' ' -f2 sha256sum.txt)" >>$GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BUNDLE }} sha256 ${{ env.SHA256SUM }}
+          path: apk/sha256sum.txt
+      - name: Upload naiveproxy assets
+        if: ${{ github.event_name == 'release' }}
+        working-directory: apk/app/build/outputs/apk/release
+        run: gh release upload "${GITHUB_REF##*/}" ${{ env.BUNDLE }} --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  win:
+    needs: cache-toolchains-win
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x64, x86, arm64]
+    env:
+      EXTRA_FLAGS: 'target_cpu="${{ matrix.arch }}"'
+      BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            ~/.cargo/bin/
+            ~/bin/ninja.exe
+          key: toolchains-win-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (win64)
+        if: ${{ matrix.arch == 'x64' }}
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/chrome-win64-*
+          key: pgo-win64-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (win32)
+        if: ${{ matrix.arch != 'x64' }}
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/chrome-win32-*
+          key: pgo-win32-arm64-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - id: ccache-timestamp
+        run: echo "CCACHE_TIMESTAMP=$(date +%s)" >>$GITHUB_OUTPUT
+      - name: Cache ccache files
+        uses: actions/cache@v4
+        with:
+          path: ~/AppData/Local/Mozilla/sccache
+          key: ccache-win-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-${{ steps.ccache-timestamp.outputs.CCACHE_TIMESTAMP }}
+          restore-keys: ccache-win-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-
+      - run: ./get-clang.sh
+      - run: ~/.cargo/bin/sccache -z
+      - run: ./build.sh
+      - run: ~/.cargo/bin/sccache -s
+      - run: ../tests/basic.sh out/Release/naive
+        # No real or emulated environment is available to test this.
+        if: ${{ matrix.arch != 'arm64' }}
+      - name: Pack naiveproxy assets
+        run: |
+          mkdir ${{ env.BUNDLE }}
+          cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }}
+          7z a ${{ env.BUNDLE }}.zip ${{ env.BUNDLE }}
+          openssl sha256 out/Release/naive.exe >sha256sum.txt
+          echo "SHA256SUM=$(cut -d' ' -f2 sha256sum.txt)" >>$GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BUNDLE }}.zip naive executable sha256 ${{ env.SHA256SUM }}
+          path: src/sha256sum.txt
+      - name: Upload naiveproxy assets
+        if: ${{ github.event_name == 'release' }}
+        run: gh release upload "${GITHUB_REF##*/}"  ${{ env.BUNDLE }}.zip --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  mac:
+    needs: cache-toolchains-mac
+    runs-on: macos-13
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x64, arm64]
+    env:
+      EXTRA_FLAGS: 'target_cpu="${{ matrix.arch }}"'
+      BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains and PGO
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/chrome/build/pgo_profiles/chrome-mac-*
+            src/gn/
+          key: toolchains-pgo-mac-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - id: ccache-timestamp
+        run: echo "CCACHE_TIMESTAMP=$(date +%s)" >>$GITHUB_OUTPUT
+      - name: Cache ccache files
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Caches/ccache
+          key: ccache-mac-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-${{ steps.ccache-timestamp.outputs.CCACHE_TIMESTAMP }}
+          restore-keys: ccache-mac-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-
+      - run: brew install ninja ccache
+      - run: pip install setuptools
+      - run: ./get-clang.sh
+      - run: ccache -z
+      - run: ./build.sh
+      - run: ccache -s
+      - run: ../tests/basic.sh out/Release/naive
+        # No real or emulated environment is available to test this.
+        if: ${{ matrix.arch != 'arm64' }}
+      - name: Pack naiveproxy assets
+        run: |
+          mkdir ${{ env.BUNDLE }}
+          cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }}
+          tar cJf ${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }}
+          openssl sha256 out/Release/naive >sha256sum.txt
+          echo "SHA256SUM=$(cut -d' ' -f2 sha256sum.txt)" >>$GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BUNDLE }}.tar.xz naive executable sha256 ${{ env.SHA256SUM }}
+          path: src/sha256sum.txt
+      - name: Upload naiveproxy assets
+        if: ${{ github.event_name == 'release' }}
+        run: gh release upload "${GITHUB_REF##*/}" ${{ env.BUNDLE }}.tar.xz --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  openwrt:
+    needs: cache-toolchains-posix
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: x86_64
+            openwrt: "target=x86 subtarget=64"
+            target_cpu: x64
+          - arch: x86
+            openwrt: "target=x86 subtarget=geode"
+            target_cpu: x86
+          - arch: aarch64_cortex-a53
+            openwrt: "target=sunxi subtarget=cortexa53"
+            target_cpu: arm64
+            extra: 'arm_cpu="cortex-a53"'
+          - arch: aarch64_cortex-a53-static
+            openwrt: "target=sunxi subtarget=cortexa53"
+            target_cpu: arm64
+            extra: 'arm_cpu="cortex-a53" build_static=true use_allocator_shim=false use_partition_alloc=false'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: aarch64_cortex-a72
+            openwrt: "target=mvebu subtarget=cortexa72"
+            target_cpu: arm64
+            extra: 'arm_cpu="cortex-a72"'
+          - arch: aarch64_cortex-a72-static
+            openwrt: "target=mvebu subtarget=cortexa72"
+            target_cpu: arm64
+            extra: 'arm_cpu="cortex-a72" build_static=true use_allocator_shim=false use_partition_alloc=false'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: aarch64_cortex-a76
+            openwrt: "target=bcm27xx subtarget=bcm2712"
+            target_cpu: arm64
+            extra: 'arm_cpu="cortex-a76"'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: aarch64_generic
+            openwrt: "target=layerscape subtarget=armv8_64b"
+            target_cpu: arm64
+          - arch: aarch64_generic-static
+            openwrt: "target=layerscape subtarget=armv8_64b"
+            target_cpu: arm64
+            extra: "build_static=true use_allocator_shim=false use_partition_alloc=false"
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: arm_arm1176jzf-s_vfp
+            openwrt: "target=brcm2708 subtarget=bcm2708"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="arm1176jzf-s" arm_fpu="vfp" arm_float_abi="hard" arm_use_neon=false arm_use_thumb=false'
+          - arch: arm_arm926ej-s
+            openwrt: "target=mxs subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="arm926ej-s" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
+          - arch: arm_cortex-a15_neon-vfpv4
+            openwrt: "target=ipq806x subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a15" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true'
+          - arch: arm_cortex-a5_vfpv4
+            openwrt: "target=at91 subtarget=sama5d3"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a5" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false'
+          - arch: arm_cortex-a7
+            openwrt: "target=mediatek subtarget=mt7629"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a7" arm_float_abi="soft" arm_use_neon=false'
+            openwrt_release: '21.02.0'
+            openwrt_gcc_ver: '8.4.0'
+          - arch: arm_cortex-a7_neon-vfpv4
+            openwrt: "target=sunxi subtarget=cortexa7"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true'
+          - arch: arm_cortex-a7_neon-vfpv4-static
+            openwrt: "target=sunxi subtarget=cortexa7"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true build_static=true use_allocator_shim=false use_partition_alloc=false'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: arm_cortex-a7_vfpv4
+            openwrt: "target=at91 subtarget=sama7"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false'
+            openwrt_release: '22.03.0'
+            openwrt_gcc_ver: '11.2.0'
+          - arch: arm_cortex-a8_vfpv3
+            openwrt: "target=sunxi subtarget=cortexa8"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a8" arm_fpu="vfpv3" arm_float_abi="hard" arm_use_neon=false'
+          - arch: arm_cortex-a9
+            openwrt: "target=bcm53xx subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false'
+          - arch: arm_cortex-a9-static
+            openwrt: "target=bcm53xx subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false build_static=true use_allocator_shim=false use_partition_alloc=false'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: arm_cortex-a9_neon
+            openwrt: "target=imx6 subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="neon" arm_float_abi="hard" arm_use_neon=true'
+          - arch: arm_cortex-a9_vfpv3-d16
+            openwrt: "target=mvebu subtarget=cortexa9"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="vfpv3-d16" arm_float_abi="hard" arm_use_neon=false'
+          - arch: arm_mpcore
+            openwrt: "target=oxnas subtarget=ox820"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="mpcore" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
+          - arch: arm_xscale
+            openwrt: "target=kirkwood subtarget=generic"
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="xscale" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false'
+          - arch: mipsel_24kc
+            openwrt: "target=ramips subtarget=rt305x"
+            target_cpu: mipsel
+            extra: 'mips_arch_variant="r2" mips_float_abi="soft"'
+          - arch: mipsel_24kc-static
+            openwrt: "target=ramips subtarget=rt305x"
+            target_cpu: mipsel
+            extra: 'mips_arch_variant="r2" mips_float_abi="soft" build_static=true use_allocator_shim=false use_partition_alloc=false'
+            openwrt_release: '24.10.0'
+            openwrt_gcc_ver: '13.3.0'
+          - arch: mipsel_mips32
+            openwrt: "target=brcm47xx subtarget=legacy"
+            target_cpu: mipsel
+            extra: 'mips_arch_variant="r1" mips_float_abi="soft"'
+          - arch: riscv64
+            openwrt: "target=sifiveu subtarget=generic"
+            target_cpu: riscv64
+            openwrt_release: '23.05.0'
+            openwrt_gcc_ver: '12.3.0'
+    env:
+      EXTRA_FLAGS: target_cpu="${{ matrix.target_cpu }}" target_os="openwrt" ${{ matrix.extra }} enable_shadow_metadata=false
+      OPENWRT_FLAGS: arch=${{ matrix.arch }} release=${{ matrix.openwrt_release || '18.06.0' }} gcc_ver=${{ matrix.openwrt_gcc_ver || '7.3.0' }} ${{ matrix.openwrt }}
+      BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache toolchains (Linux, OpenWrt, Android)
+        uses: actions/cache@v4
+        with:
+          path: |
+            src/third_party/llvm-build/Release+Asserts/
+            src/gn/
+            src/qemu-user-static*.deb
+          key: toolchains-posix-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache PGO (Linux, OpenWrt)
+        uses: actions/cache@v4
+        with:
+          path: src/chrome/build/pgo_profiles/
+          key: pgo-linux-openwrt-${{ hashFiles('CHROMIUM_VERSION') }}-v${{ env.CACHE_EPOCH }}
+      - name: Cache sysroot
+        uses: actions/cache@v4
+        with:
+          path: src/out/sysroot-build/openwrt
+          key: sysroot-openwrt-23.05.0-${{ matrix.arch }}-v${{ env.CACHE_EPOCH }}
+      - id: ccache-timestamp
+        run: echo "CCACHE_TIMESTAMP=$(date +%s)" >>$GITHUB_OUTPUT
+      - name: Cache ccache files
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ccache
+          key: ccache-openwrt-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-${{ steps.ccache-timestamp.outputs.CCACHE_TIMESTAMP }}
+          restore-keys: ccache-openwrt-${{ matrix.arch }}-${{ hashFiles('CHROMIUM_VERSION') }}-
+      - name: Install APT packages
+        run: |
+          sudo apt update
+          sudo apt install ninja-build pkg-config ccache bubblewrap
+          sudo apt remove -y qemu-user-binfmt
+          sudo dpkg -i qemu-user-static*.deb
+          # libc6-i386 interferes with x86 build
+          sudo apt remove libc6-i386
+      - run: ./get-clang.sh
+      - run: ccache -z
+      - run: ./build.sh
+      - run: ccache -s
+      - run: ../tests/basic.sh out/Release/naive
+      - name: Pack naiveproxy assets
+        run: |
+          mkdir ${{ env.BUNDLE }}
+          cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }}
+          tar cJf ${{ env.BUNDLE }}.tar.xz ${{ env.BUNDLE }}
+          openssl sha256 out/Release/naive >sha256sum.txt
+          echo "SHA256SUM=$(cut -d' ' -f2 sha256sum.txt)" >>$GITHUB_ENV
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BUNDLE }}.tar.xz naive executable sha256 ${{ env.SHA256SUM }}
+          path: src/sha256sum.txt
+      - name: Upload naiveproxy assets
+        if: ${{ github.event_name == 'release' }}
+        run: gh release upload "${GITHUB_REF##*/}" ${{ env.BUNDLE }}.tar.xz --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,8 @@
 src/chrome/android/profiles/afdo.prof
+src/chrome/build/pgo_profiles/
 src/gn/
 src/third_party/llvm-build/
+src/third_party/android_toolchain/
 src/out/
+.vscode/
 *.pyc
--- a/.travis.yml
+++ b/.travis.yml
@ -1,43 +0,0 @@
-branches:
-  except:
-    - dev
-language: cpp
-os:
-  - linux
-  - osx
-dist: xenial
-addons:
-  apt:
-    sources:
-      - sourceline: 'deb http://archive.ubuntu.com/ubuntu/ xenial-backports universe'
-    packages:
-      - ninja-build=1.7.1-1~ubuntu16.04.1
-      - pkg-config
-      - libnss3-dev
-  homebrew:
-    packages:
-      - ninja
-      - ccache
-cache: ccache
-script:
-  - ./tools/import-upstream.sh
-  - ( cd src; ./get-clang.sh )
-  - ccache -s
-  - ( cd src; ./build.sh )
-  - ccache -s
-  - ./tests/basic.sh src/out/Release/naive
-  - export BUILD_NAME="naiveproxy-$TRAVIS_BRANCH-$TRAVIS_OS_NAME"
-  - mkdir $BUILD_NAME
-  - cp src/out/Release/naive src/config.json LICENSE USAGE.txt $BUILD_NAME
-  - tar cJf $BUILD_NAME.tar.xz $BUILD_NAME
-deploy:
-  provider: releases
-  api_key:
-    secure: hZ+M3GvNpPPMri0u7HkeDM8qCNSzCP2kBxL/68XgF3uvMDkJRX5/gyq27EoQMHyRxni759LlwHttRn6nHSg/CwNgK4fD4WPZWU99XIWKdlI+P1AQkHThjNtABv3P7JOq1HxyuwrcaBPybnDjsQTFE6HG5zsIhXZlUTCHbndCBpYPuDnaqKJJUv4/WzoEjXAlBSkAsBGhEQv+HZhaupw5vSkDkulNgXZrXOoO6uzAtAiR5St38dV7cWXgk6UwoyrVaV8cO0cltveyEPkGYMXJh6YkopJjSVrkYlI8vWsA8CgwdhXwAkYoG1uaIDUdNdlrBXNuA0BOFcU3iEo3D9H/z1/WQUnCuAOVCkYC/QhkTCsioQ5vaNA56+3uY8KOSDNo8XxxBzRIUSwul2lwHCNl6+cf1EhO9brI3Q8q/ZPZLmNIqYDXAI29/MMC13g/ql8UUcy2TwGrx2OE73SIzVBm2hVYI6FFs2hjJzMkknV83K0kr515gXrI+p7ANqnA9vdRBx7zMdOT1etFeuD06wjbLGLmHTS4ykhDYl6wn26fJHm3/OkqNyWllghc8DZnpAHh5AAYrrTIQPlSgtyqGL2qCoCPHbb2WgWewSVhqY+p7JMPchAc6myW3H2c7yL+TDMdRcr9I7DDOpvvfMoGx527Lji54mxGdZmdEpSGxi9Rx3g=
-  file: $BUILD_NAME.tar.xz
-  skip_cleanup: true
-  name: $TRAVIS_BRANCH
-  prerelease: true
-  on:
-    tags: true
-    all_branches: true
--- a/2
+++ b/2
@ -1 +1 @@
-71.0.3578.98
+135.0.7049.38
--- a/README.md
+++ b/README.md
@ -1,109 +1,163 @@
-# NaiveProxy [![Build Status](https://travis-ci.com/klzgrad/naiveproxy.svg?branch=master)](https://travis-ci.com/klzgrad/naiveproxy) [![Build status](https://ci.appveyor.com/api/projects/status/ohpyaf49baihmxa9?svg=true)](https://ci.appveyor.com/project/klzgrad/naiveproxy)
+# NaïveProxy ![build workflow](https://github.com/klzgrad/naiveproxy/actions/workflows/build.yml/badge.svg)

-A secure, censorship-resistent proxy.
+NaïveProxy uses Chromium's network stack to camouflage traffic with strong censorship resistence and low detectablility. Reusing Chrome's stack also ensures best practices in performance and security.

-NaiveProxy is naive as it reuses standard protocols (HTTP/2, HTTP/3) and common network stacks (Chrome, Caddy) with little variation. By being as common and boring as possible NaiveProxy is practically indistinguishable from mainstream traffic. Reusing common software stacks also ensures best practices in performance and security.
-
-The following attacks are mitigated:
+The following traffic attacks are mitigated by using Chromium's network stack:

 * Website fingerprinting / traffic classification: [mitigated](https://arxiv.org/abs/1707.00641) by traffic multiplexing in HTTP/2.
 * [TLS parameter fingerprinting](https://arxiv.org/abs/1607.01639): defeated by reusing [Chrome's network stack](https://www.chromium.org/developers/design-documents/network-stack).
-* [Active probing](https://ensa.fi/active-probing/): defeated by *application fronting*, i.e. hiding proxy servers behind a commonly used frontend with application-layer routing.
+* [Active probing](https://ensa.fi/active-probing/): defeated by *application fronting*, i.e. hiding proxy servers behind a commonly used frontend server with application-layer routing.
 * Length-based traffic analysis: mitigated by length padding.

 ## Architecture

-[Browser → Naive (client)] ⟶ Censor ⟶ [Frontend → Naive (server)] ⟶ Internet
+[Browser → Naïve client] ⟶ Censor ⟶ [Frontend → Naïve server] ⟶ Internet

-NaiveProxy uses Chrome's network stack. What the censor can see is exactly regular HTTP/2 traffic between Chrome and standard Frontend (e.g. Caddy, HAProxy).
+NaïveProxy uses Chromium's network stack to parrot traffic between regular Chrome browsers and standard frontend servers.

-Frontend also reroutes unauthenticated users and active probes to a backend HTTP server, making it impossible to detect the existence of a proxy:
+The frontend server can be any well-known reverse proxy that is able to route HTTP/2 traffic based on HTTP authorization headers, preventing active probing of proxy existence. Known ones include Caddy with its forwardproxy plugin and HAProxy.

-Probe ⟶ Frontend ⟶ index.html
+The Naïve server here works as a forward proxy and a packet length padding layer. Caddy forwardproxy is also a forward proxy but it lacks a padding layer. A [fork](https://github.com/klzgrad/forwardproxy) adds the NaïveProxy padding layer to forwardproxy, combining both in one.

-## Download
+## Download NaïveProxy

-See [latest release](https://github.com/klzgrad/naiveproxy/releases/latest).
+Download [here](https://github.com/klzgrad/naiveproxy/releases/latest). Supported platforms include: Windows, Android (with [Exclave](https://github.com/dyhkwong/Exclave), [NekoBox](https://github.com/MatsuriDayo/NekoBoxForAndroid)), Linux, Mac OS, and OpenWrt ([support status](https://github.com/klzgrad/naiveproxy/wiki/OpenWrt-Support)).

-Note: On Linux libnss3 must be installed before using the prebuilt binary.
+Users should always use the latest version to keep signatures identical to Chrome.

-## Setup
+Build from source: Please see [.github/workflows/build.yml](https://github.com/klzgrad/naiveproxy/blob/master/.github/workflows/build.yml).

-Locally run `./naive --proxy=https://user:pass@domain.example` and point the browser to a SOCKS5 proxy at port 1080.
+## Server setup

-On the server run `./caddy` as the frontend with the following Caddyfile
+The following describes the naïve fork of Caddy forwardproxy setup.
+
+Download [here](https://github.com/klzgrad/forwardproxy/releases/latest) or build from source:
+```sh
+go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
+~/go/bin/xcaddy build --with github.com/caddyserver/forwardproxy=github.com/klzgrad/forwardproxy@naive
 ```
-domain.example
-root /var/www/html
-forwardproxy {
-  basicauth user pass
-  hide_ip
-  hide_via
-  probe_resistance secret.localhost
-  upstream http://127.0.0.1:8080
+
+Example Caddyfile (replace `user` and `pass` accordingly):
+```
+{
+  order forward_proxy before file_server
+}
+:443, example.com {
+  tls me@example.com
+  forward_proxy {
+    basic_auth user pass
+    hide_ip
+    hide_via
+    probe_resistance
+  }
+  file_server {
+    root /var/www/html
+  }
 }
 ```
-and `./naive --listen=http://127.0.0.1:8080` behind it. See [Server Setup](https://github.com/klzgrad/naiveproxy/wiki/Server-Setup) for more details on building Caddy and enabling QUIC.
+`:443` must appear first for this Caddyfile to work. See Caddyfile [docs](https://caddyserver.com/docs/caddyfile/directives/tls) for customizing TLS certificates. For more advanced usage consider using [JSON for Caddy 2's config](https://caddyserver.com/docs/json/).

-For more information on parameter usage and format of `config.json`, see [USAGE.txt](https://github.com/klzgrad/naiveproxy/blob/master/USAGE.txt). See also [Parameter Tuning](https://github.com/klzgrad/naiveproxy/wiki/Parameter-Tuning) to improve client-side performance.
-
-## Build
-
-If you don't like to download binaries, you can build NaiveProxy.
-
-Prerequisites:
-* Ubuntu (apt-get install): git, python2, ninja-build (>= 1.7), pkg-config, libnss3-dev, ccache (optional)
-* MacOS (brew install): git, ninja, ccache (optional)
-* Windows ([choco install](https://chocolatey.org/)): git, python2, ninja, visualstudio2017community. See [Chromium's page](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md#Visual-Studio) for detail on Visual Studio setup requirements.
-
-
-Build (output to `./out/Release/naive`):
+Run with the Caddyfile:
 ```
-git clone https://github.com/klzgrad/naiveproxy.git
-cd naiveproxy/src
-./get-clang.sh
-./build.sh
+sudo setcap cap_net_bind_service=+ep ./caddy
+./caddy start
 ```
-The scripts download tools from Google servers with curl. If there is trouble try to set a proxy environment variable for curl, e.g. `export ALL_PROXY=socks5h://127.0.0.1:1080`.

-## FAQ
+See also [Systemd unit example](https://github.com/klzgrad/naiveproxy/wiki/Run-Caddy-as-a-daemon) and [HAProxy setup](https://github.com/klzgrad/naiveproxy/wiki/HAProxy-Setup).

-### Why not use Go, Node, etc. for TLS?
+## Client setup

-Their TLS stacks have distinct features that can be [easily detected](https://arxiv.org/abs/1607.01639). TLS parameters are generally very informative and distinguishable. Most client-originated traffic comes from browsers, putting the custom network stacks in the minority.
+Run `./naive` with the following `config.json` to get a SOCKS5 proxy at local port 1080.
+```json
+{
+  "listen": "socks://127.0.0.1:1080",
+  "proxy": "https://user:pass@example.com"
+}
+```

-Previously, Tor tried to mimic Firefox's TLS signature and still got [identified and blocked by firewalls](https://groups.google.com/d/msg/traffic-obf/BpFSCVgi5rs/nCqNwoeRKQAJ), because that signature was of an outdated version of Firefox and the firewall determined the rate of collateral damage would be acceptable. If we use the signature of the most commonly used browser the collateral damage of blocking it would be unacceptable.
+Or `quic://user:pass@example.com`, if it works better. See also [parameter usage](https://github.com/klzgrad/naiveproxy/blob/master/USAGE.txt) and [performance tuning](https://github.com/klzgrad/naiveproxy/wiki/Performance-Tuning).

-### Why not use Go, Node, etc. for performance?
+## Third-party integration

-Any languages can be used for high performance architectures, but not all architectures have high performance.
+* [v2rayN](https://github.com/2dust/v2rayN), GUI client, Windows
+* [NekoBox for Android](https://github.com/MatsuriDayo/NekoBoxForAndroid), Proxy toolchain, Android
+* [NekoRay / NekoBox For PC](https://github.com/MatsuriDayo/nekoray), Qt based GUI, Windows, Linux

-Go, Node, etc. make it easy to implement a 1:1 connection proxy model, i.e. creating one upstream connection for every user connection. Then under this model the goal of performance is to reduce overhead in setting up each upstream connection. Toward that goal people start to reinvent their own 0-RTT cryptographic protocols (badly) as TLS goes out of the window because it either spends take several round trips in handshakes or makes it [a pain to set up 0-RTT properly](https://tools.ietf.org/html/rfc8446#section-8). Then people also start to look at low level optimization such as TCP Fast Open.
+## Notes for downstream

-Meanwhile, Google has removed the code for TCP Fast Open in Chromium all together (they [authored](https://tools.ietf.org/html/rfc7413) the RFC of TCP Fast Open in 2014). The literal reason given for this reversal was
+Do not use the master branch to track updates, as it rebases from a new root commit for every new Chrome release. Use stable releases and the associated tags to track new versions, where short release notes are also provided.

-> We never enabled it by default, and have no plans to, so we should just remove it.  QUIC also makes it less useful, and TLS 1.2 0-RTT session restore means it potentially mutates state.
+## Padding protocol, an informal specification

-And the real reason Google never enabled TCP Fast Open by default is that it was dragged down by middleboxes and [never really worked](https://blog.donatas.net/blog/2017/03/09/tfo/). In Linux kernel there is a sysctl called `tcp_fastopen_blackhole_timeout_sec`, and whenever a SYN packet is dropped, TCP Fast Open is blackholed for this much time, starting at one hour and increasing exponentially, rendering it practically useless. Today TCP Fast Open accounts for [0.1% of the Internet traffic](https://ieeexplore.ieee.org/document/8303960/), so using it actually makes you highly detectable!
+The design of this padding protocol opts for low overhead and easier implementation, in the belief that proliferation of expendable, improvised circumvention protocol designs is a better logistical impediment to censorship research than sophisicated designs.

-It was obvious to Google then and is obvious to us now that the road to zero latency at the cost of compromising security and interoperability is a dead end under the 1:1 connection model, which is why Google pursued connection persistence and 1:N connection multiplexing in HTTP/2 and more radical overhaul of HTTP/TLS/TCP in QUIC. In a 1:N connection model, the cost of setting up the first connection is amortized, and the following connections cost nothing to set up without any security or stability compromises, and the race to zero connection latency becomes irrelevant.
+### Proxy payload padding

-Complex, battle-tested logic for connection management was [implemented](https://web.archive.org/web/20161222115511/https://insouciant.org/tech/connection-management-in-chromium/) in Chromium. The same thing is not so easy to do again from scratch with the aforementioned languages.
+NaïveProxy proxies bidirectional streams through HTTP/2 (or HTTP/3) CONNECT tunnels. The bidirectional streams operate in a sequence of reads and writes of data. The first `kFirstPaddings` (8) reads and writes in a bidirectional stream after the stream is established are padded in this format:
+```c
+struct PaddedData {
+  uint8_t original_data_size_high;  // original_data_size / 256
+  uint8_t original_data_size_low;  // original_data_size % 256
+  uint8_t padding_size;
+  uint8_t original_data[original_data_size];
+  uint8_t zeros[padding_size];
+};
+```
+`padding_size` is a random integer uniformally distributed in [0, `kMaxPaddingSize`] (`kMaxPaddingSize`: 255). `original_data_size` cannot be greater than 65535, or it has to be split into several reads or writes.

-### Why not reinvent cryptos?
+`kFirstPaddings` is chosen to be 8 to flatten the packet length distribution spikes formed from common initial handshakes:
+- Common client initial sequence: 1. TLS ClientHello; 2. TLS ChangeCipherSpec, Finished; 3. H2 Magic, SETTINGS, WINDOW_UPDATE; 4. H2 HEADERS GET; 5. H2 SETTINGS ACK.
+- Common server initial sequence: 1. TLS ServerHello, ChangeCipherSpec, ...; 2. TLS Certificate, ...; 3. H2 SETTINGS; 4. H2 WINDOW_UPDATE; 5. H2 SETTINGS ACK; 6. H2 HEADERS 200 OK.

-Because the first rule of cryptography is: [Don't roll your](http://loup-vaillant.fr/articles/rolling-your-own-crypto) [own cryptos](https://security.stackexchange.com/questions/18197/why-shouldnt-we-roll-our-own).
+Further reads and writes after `kFirstPaddings` are unpadded to avoid performance overhead. Also later packet lengths are usually considered less informative.

-If you do roll your own cryptos, see what [happened](https://groups.google.com/d/msg/traffic-obf/CWO0peBJLGc/Py-clLSTBwAJ) with Shadowsocks. (Spoiler: it encrypts, but doesn't authenticates, leading to active probing exploits, and more exploits after duct-tape fixes.)
+### H2 RST_STREAM frame padding

-### Why not use HTTP/2 proxy from browser directly?
+In experiments, NaïveProxy tends to send too many RST_STREAM frames per session, an uncommon behavior from regular browsers. To solve this, an END_STREAM DATA frame padded with total length distributed in [48, 72] is prepended to the RST_STREAM frame so it looks like a HEADERS frame. The server often replies to this with a WINDOW_UPDATE because padding is accounted in flow control. Whether this results in a new uncommon behavior is still unclear.

-You may have wondered why not use Chrome directly if NaiveProxy reuses Chrome's network stack. The answer is yes, you can. You will get 80% of what NaiveProxy does (TLS, connection multiplexing, application fronting) without NaiveProxy, which is also what makes NaiveProxy indistinguishale from normal traffic. Simply point your browser to Caddy as an HTTP/2 or HTTP/3 forward proxy directly.
+### H2 HEADERS frame padding

-But this setup is prone to basic traffic analysis due to lack of obfuscation and predictable packet sizes in TLS handshakes. [The bane of "TLS-in-TLS" tunnels](http://blog.zorinaq.com/my-experience-with-the-great-firewall-of-china/) is that this combination is just so different from any normal protocols (nobody does 3-way handshakes twice in a row) and the record sizes of TLS handshakes are so predictable that no machine learning is needed to [detect it](https://github.com/shadowsocks/shadowsocks-org/issues/86#issuecomment-362809854).
+The CONNECT request and response frames are too short and too uncommon. To make its length similar to realistic HEADERS frames, a `padding` header is filled with a sequence of symbols that are not Huffman coded and are pseudo-random enough to avoid being indexed. The length of the padding sequence is randomly distributed in [16, 32] (request) or [30, 62] (response).

-The browser will introduce an extra 1RTT delay during proxied connection setup because of interpretation of HTTP RFCs. The browser will wait for a 200 response after a CONNECT request, incuring 1RTT which is not necessary. NaiveProxy does HTTP Fast CONNECT similar to TCP Fast Open, i.e. send subsequent data immediately after CONNECT. Also, you may have to type in the password for the proxy everytime you open the browser. NaiveProxy sends the password automatically.
+### Opt-in of padding protocol

-Thus, traffic obfuscation, HTTP Fast CONNECT, and auto-authentication are the crucial last 20% provided by NaiveProxy. These can't be really achieved inside Chrome as extensions/apps because they don't have access to sockets. NaiveProxy extracts Chromium's network stack without all the other baggage to build a small binary (4% of full Chrome build).
+NaïveProxy clients should interoperate with any regular HTTP/2 proxies unaware of this padding protocol. NaïveProxy servers (i.e. any proxy server capable of the this padding protocol) should interoperate with any regular HTTP/2 clients (e.g. regular browsers) unaware of this padding protocol.
+
+NaïveProxy servers and clients determines whether the counterpart is capable of this padding protocol by the presence of the `padding` header in the CONNECT request and response respectively. The padding procotol is enabled only if the `padding` header exists.
+
+The first CONNECT request to a server cannot use "Fast Open" to send payload before response, because the server's padding capability has not been determined from the first response and it's unknown whether to send padded or unpadded payload for Fast Open.
+
+## Changes from Chromium upstream
+
+- Minimize source code and build size (0.3% of the original)
+- Disable exceptions and RTTI, except on Mac and Android.
+- Support OpenWrt builds
+- (Android, Linux) Use the builtin verifier instead of the system verifier (drop dependency of NSS on Linux) and read the system trust store from (following Go's behavior in crypto/x509/root_unix.go and crypto/x509/root_linux.go):
+  - The file in environment variable SSL_CERT_FILE
+  - The first available file of
+    -  /etc/ssl/certs/ca-certificates.crt (Debian/Ubuntu/Gentoo etc.)
+    -  /etc/pki/tls/certs/ca-bundle.crt (Fedora/RHEL 6)
+    -  /etc/ssl/ca-bundle.pem (OpenSUSE)
+    -  /etc/pki/tls/cacert.pem (OpenELEC)
+    -  /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem (CentOS/RHEL 7)
+    -  /etc/ssl/cert.pem (Alpine Linux)
+  - Files in the directory of environment variable SSL_CERT_DIR
+  - Files in the first available directory of
+    -  /etc/ssl/certs (SLES10/SLES11, https://golang.org/issue/12139)
+    -  /etc/pki/tls/certs (Fedora/RHEL)
+    -  /system/etc/security/cacerts (Android)
+- Handle AIA response in PKCS#7 format
+- Allow higher socket limits for proxies
+- Force tunneling for all sockets
+- Support HTTP/2 and HTTP/3 CONNECT tunnel Fast Open using the `fastopen` header
+- Pad RST_STREAM frames
+
+## Known weaknesses
+
+* HTTP CONNECT Fast Open creates back to back h2 packets consistently, which should not appear so often. This could be fixed with a little bit of corking but it would require surgical change deep in Chromium h2 stack, not very easy to do.
+* TLS over TLS requires more handshake round trips than needed by common h2 requests, that is, no h2 requests need these many back and forth handshakes. There is no simple way to avoid this besides doing MITM proxying, breaking E2E encryption.
+* TLS over TLS overhead causes visible packet length enlargement and lack of small packets. Removing this overhead also requires MITM proxying.
+* TLS over TLS overhead also causes packets to consistently exceed MTU limits, which should not happen for an originating user agent. Fixing this requires re-segmentation and it is not easy to do.
+* Packet length obfuscation partly relies on h2 multiplexing, which does not work if there is only one connection, a scenario not uncommon. It is not clear how to create covering co-connections organically (i.e. not hard coded).
+* Multiplexing requires use of a few long-lived tunnel connections. It is not clearly how long is appropriate for parroting and how to convincingly rotate the connections if there is an age limit or how to detect and recover stuck tunnel connections convincingly.

-But if you don't need the best performance, and unobfuscated TLS-in-TLS somehow still works for you, you can just keep using Caddy proxy with your browser.
--- a/USAGE.txt
+++ b/USAGE.txt
@ -1,72 +1,112 @@
-Usage: naive { OPTIONS | [/path/to/config.json] }
+Usage: naive --listen=... --proxy=...
+       naive [/path/to/config.json]

 Description:

-    naive is a proxy to transport traffic as Chromium traffic. It can be
-    used as both the client and the server or together.
+  naive is a proxy that transports traffic in Chromium's pattern.
+  It works as both a proxy client and a proxy server or together.

-    There are two ways to specify options. The first is through command
-    line flags: naive OPTIONS. The second is through a JSON
-    configuration file. If there are no command line flags or path
-    specified, it will try to read from "config.json" by default.
+  Options in the form of `naive --listen=... --proxy=...` can also be
+  specified using a JSON file:

-    The syntax of config.json fields are mapped exactly to command line
-    flags, e.g.
+    {
+      "listen": "...",
+      "proxy": "..."
+    }

-        {
-          "proxy": "https://user:pass@example.org"
-        }
+  Specifying a flag multiple times on the command line is equivalent to
+  having an array of multiple strings in the JSON file.

-    is exactly the same as --proxy=https://user:pass@example.org.  All
-    command line flags must have string values in config.json, except if
-    the flags are boolean then they must have boolean values too.
+  Uses "config.json" by default if run without arguments.

 Options:

-    -h, --help
+  -h, --help

-        Shows help message.
+    Shows help message.

-    --version
+  --version

-        Prints version
+    Prints version.

-    --listen=<proto>://[addr][:port]
+  --listen=LISTEN-URI

-        Listens at addr:port with protocol <proto>. Allowed values for
-        proto: "socks", "http". The default proto is socks. The default
-        addr is 0.0.0.0. The default port is 1080.
+    LISTEN-URI = <LISTEN-PROTO>"://"[<USER>":"<PASS>"@"][<ADDR>][":"<PORT>]
+    LISTEN-PROTO = "socks" | "http" | "redir"

-    --proxy=<proto>://[<user>:<pass>@]<hostname>[:<port>]
+    Listens at addr:port with protocol <LISTEN-PROTO>.
+    Can be specified multiple times to listen on multiple ports.
+    Default proto, addr, port: socks, 0.0.0.0, 1080.

-        Routes traffic via the proxy server. Allowed values for proto:
-        "https", "quic". The value of port is inferred from proto if not
-        specified. If hostname is an IP address, an internal host
-        resolver rule is setup to resolve "example" to it to make TLS
-        certificate validation work.
+    Note: redir requires specific iptables rules and uses no authentication.

-        If this option is not set, connects to origin server directly.
+      (Redirecting locally originated traffic)
+      iptables -t nat -A OUTPUT -d $proxy_server_ip -j RETURN
+      iptables -t nat -A OUTPUT -p tcp -j REDIRECT --to-ports 1080

-    --padding
+      (Redirecting forwarded traffic on a router)
+      iptables -t nat -A PREROUTING -p tcp -j REDIRECT --to-ports 1080

-        Obfuscates traffic by adding length paddings.
+      Also activates a DNS resolver on the same UDP port. Similar iptables
+      rules can redirect DNS queries to this resolver. The resolver returns
+      artificial addresses that are translated back to the original domain
+      names in proxy requests and then resolved remotely.

-    --host-resolver-rules=...
+      The artificial results are not saved for privacy, so restarting the
+      resolver may cause downstream to cache stale results.

-        This is the same as Chromium's flag of the same name. Google it
-        as the full description is too technical.
+  --proxy=PROXY

-    --log=[<path>]
+    PROXY = PROXY-CHAIN | SOCKS-PROXY
+    PROXY-CHAIN = <PROXY-URI>[","<PROXY-CHAIN>] 
+    PROXY-URI = <PROXY-PROTO>"://"[<USER>":"<PASS>"@"]<HOSTNAME>[":"<PORT>]
+    PROXY-PROTO = "http" | "https" | "quic"
+    SOCKS-PROXY = "socks://"<HOSTNAME>[":"<PORT>]

-        Saves log to the file at <path>. If <path> is empty, prints to
-        console.
+    Routes traffic via the proxy chain.
+    The default proxy is directly connection without proxying.
+    The last PROXY-URI is negotiated automatically for Naive padding.
+    Limitations:
+      * QUIC proxies cannot follow TCP-based proxies in a proxy chain.
+      * The user needs to ensure there is no loop in the proxy chain.
+      * SOCKS proxies do not support chaining, authentication, or Naive padding.

-        If this option is not set, no log is saved for privacy.
+  --insecure-concurrency=<N>

-    --log-net-log=<path>
+    Use N concurrent tunnel connections to be more robust under bad network
+    conditions. More connections make the tunneling easier to detect and less
+    secure. This project strives for the strongest security against traffic
+    analysis. Using it in an insecure way defeats its purpose.

-        Saves NetLog. View at https://netlog-viewer.appspot.com/.
+    If you must use this, try N=2 first to see if it solves your issues.
+    Strongly recommend against using more than 4 connections here.

-    --ssl-key-log-file=<path>
+  --extra-headers=...

-        Saves SSL keys for Wireshark inspection.
+    Appends extra headers in requests to the proxy server.
+    Multiple headers are separated by CRLF.
+
+  --host-resolver-rules="MAP proxy.example.com 1.2.3.4"
+
+    Statically resolves a domain name to an IP address.
+
+  --resolver-range=CIDR
+
+    Uses this range in the builtin resolver. Default: 100.64.0.0/10.
+
+  --log=[<path>]
+
+    Saves log to the file at <path>. If path is empty, prints to
+    console. No log is saved or printed by default for privacy.
+
+  --log-net-log=<path>
+
+    Saves NetLog. View at https://netlog-viewer.appspot.com/.
+
+  --ssl-key-log-file=<path>
+
+    Saves SSL keys for Wireshark inspection.
+
+  --no-post-quantum
+
+    Overrides the default and disables post-quantum key agreement.
--- a/apk/.gitignore
+++ b/apk/.gitignore
@ -0,0 +1,3 @@
+.gradle/
+app/build/
+app/libs/
--- a/apk/app/build.gradle.kts
+++ b/apk/app/build.gradle.kts
@ -0,0 +1,73 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "io.nekohasekai.sagernet.plugin.naive"
+
+    signingConfigs {
+        create("release") {
+            storeFile = rootProject.file("release.keystore")
+            storePassword = System.getenv("KEYSTORE_PASS")
+            keyAlias = "release"
+            keyPassword = System.getenv("KEYSTORE_PASS")
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            signingConfig = signingConfigs.getByName("release")
+        }
+    }
+
+    buildToolsVersion = "35.0.0"
+
+    compileSdk = 35
+
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 35
+
+        applicationId = "io.nekohasekai.sagernet.plugin.naive"
+        versionCode = System.getenv("APK_VERSION_NAME").removePrefix("v").split(".")[0].toInt() * 10 + System.getenv("APK_VERSION_NAME").removePrefix("v").split("-")[1].toInt()
+        versionName = System.getenv("APK_VERSION_NAME").removePrefix("v")
+        splits.abi {
+            isEnable = true
+            isUniversalApk = false
+            reset()
+            include(System.getenv("APK_ABI"))
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    lint {
+        showAll = true
+        checkAllWarnings = true
+        checkReleaseBuilds = false
+        warningsAsErrors = true
+    }
+
+    packaging {
+        jniLibs.useLegacyPackaging = true
+    }
+
+    applicationVariants.all {
+        outputs.all {
+            this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
+            outputFileName =
+                outputFileName.replace(project.name, "naiveproxy-plugin-v$versionName")
+                    .replace("-release", "")
+                    .replace("-oss", "")
+        }
+    }
+
+    sourceSets.getByName("main") {
+        jniLibs.srcDir("libs")
+    }
+}
--- a/apk/app/src/main/AndroidManifest.xml
+++ b/apk/app/src/main/AndroidManifest.xml
@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="internalOnly"
+    tools:ignore="MissingLeanbackLauncher">
+
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="Naïve Plugin"
+        android:roundIcon="@mipmap/ic_launcher_round">
+        <provider
+            android:name=".BinaryProvider"
+            android:authorities="io.nekohasekai.sagernet.plugin.naive.BinaryProvider"
+            android:directBootAware="true"
+            android:exported="true"
+            tools:ignore="ExportedContentProvider">
+            <intent-filter>
+                <action android:name="io.nekohasekai.sagernet.plugin.ACTION_NATIVE_PLUGIN" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="io.nekohasekai.sagernet.plugin.ACTION_NATIVE_PLUGIN" />
+                <data
+                    android:host="io.nekohasekai.sagernet"
+                    android:path="/naive-plugin"
+                    android:scheme="plugin" />
+            </intent-filter>
+
+            <meta-data
+                android:name="io.nekohasekai.sagernet.plugin.id"
+                android:value="naive-plugin" />
+            <meta-data
+                android:name="io.nekohasekai.sagernet.plugin.executable_path"
+                android:value="libnaive.so" />
+        </provider>
+    </application>
+
+</manifest>
--- a/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/NativePluginProvider.kt
+++ b/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/NativePluginProvider.kt
@ -0,0 +1,98 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ *                                                                            *
+ * This program 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.                                       *
+ *                                                                            *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package io.nekohasekai.sagernet.plugin
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.database.MatrixCursor
+import android.net.Uri
+import android.os.Bundle
+import android.os.ParcelFileDescriptor
+
+abstract class NativePluginProvider : ContentProvider() {
+    override fun getType(uri: Uri): String? = "application/x-elf"
+
+    override fun onCreate(): Boolean = true
+
+    /**
+     * Provide all files needed for native plugin.
+     *
+     * @param provider A helper object to use to add files.
+     */
+    protected abstract fun populateFiles(provider: PathProvider)
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?,
+    ): Cursor? {
+        check(selection == null && selectionArgs == null && sortOrder == null)
+        val result = MatrixCursor(projection)
+        populateFiles(PathProvider(uri, result))
+        return result
+    }
+
+    /**
+     * Returns executable entry absolute path.
+     * This is used for fast mode initialization where ss-local launches your native binary at the path given directly.
+     * In order for this to work, plugin app is encouraged to have the following in its AndroidManifest.xml:
+     *  - android:installLocation="internalOnly" for <manifest>
+     *  - android:extractNativeLibs="true" for <application>
+     *
+     * Default behavior is throwing UnsupportedOperationException. If you don't wish to use this feature, use the
+     * default behavior.
+     *
+     * @return Absolute path for executable entry.
+     */
+    open fun getExecutable(): String = throw UnsupportedOperationException()
+
+    abstract fun openFile(uri: Uri): ParcelFileDescriptor
+    override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor {
+        check(mode == "r")
+        return openFile(uri)
+    }
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle? = when (method) {
+        PluginContract.METHOD_GET_EXECUTABLE -> {
+            Bundle().apply {
+                putString(PluginContract.EXTRA_ENTRY, getExecutable())
+            }
+        }
+        else -> super.call(method, arg, extras)
+    }
+
+    // Methods that should not be used
+    override fun insert(uri: Uri, values: ContentValues?): Uri? =
+        throw UnsupportedOperationException()
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+    ): Int =
+        throw UnsupportedOperationException()
+
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?): Int =
+        throw UnsupportedOperationException()
+}
--- a/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/PathProvider.kt
+++ b/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/PathProvider.kt
@ -0,0 +1,53 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ *                                                                            *
+ * This program 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.                                       *
+ *                                                                            *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package io.nekohasekai.sagernet.plugin
+
+import android.database.MatrixCursor
+import android.net.Uri
+import java.io.File
+
+/**
+ * Helper class to provide relative paths of files to copy.
+ */
+class PathProvider internal constructor(baseUri: Uri, private val cursor: MatrixCursor) {
+    private val basePath = baseUri.path?.trim('/') ?: ""
+
+    fun addPath(path: String, mode: Int = 0b110100100): PathProvider {
+        val trimmed = path.trim('/')
+        if (trimmed.startsWith(basePath)) cursor.newRow()
+                .add(PluginContract.COLUMN_PATH, trimmed)
+                .add(PluginContract.COLUMN_MODE, mode)
+        return this
+    }
+    fun addTo(file: File, to: String = "", mode: Int = 0b110100100): PathProvider {
+        var sub = to + file.name
+        if (basePath.startsWith(sub)) if (file.isDirectory) {
+            sub += '/'
+            file.listFiles()!!.forEach { addTo(it, sub, mode) }
+        } else addPath(sub, mode)
+        return this
+    }
+    fun addAt(file: File, at: String = "", mode: Int = 0b110100100): PathProvider {
+        if (basePath.startsWith(at)) {
+            if (file.isDirectory) file.listFiles()!!.forEach { addTo(it, at, mode) } else addPath(at, mode)
+        }
+        return this
+    }
+}
--- a/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/PluginContract.kt
+++ b/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/PluginContract.kt
@ -0,0 +1,34 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ *                                                                            *
+ * This program 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.                                       *
+ *                                                                            *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package io.nekohasekai.sagernet.plugin
+
+object PluginContract {
+
+    const val ACTION_NATIVE_PLUGIN = "io.nekohasekai.sagernet.plugin.ACTION_NATIVE_PLUGIN"
+    const val EXTRA_ENTRY = "io.nekohasekai.sagernet.plugin.EXTRA_ENTRY"
+    const val METADATA_KEY_ID = "io.nekohasekai.sagernet.plugin.id"
+    const val METADATA_KEY_EXECUTABLE_PATH = "io.nekohasekai.sagernet.plguin.executable_path"
+    const val METHOD_GET_EXECUTABLE = "sagernet:getExecutable"
+
+    const val COLUMN_PATH = "path"
+    const val COLUMN_MODE = "mode"
+    const val SCHEME = "plugin"
+    const val AUTHORITY = "io.nekohasekai.sagernet"
+}
--- a/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/naive/BinaryProvider.kt
+++ b/apk/app/src/main/java/io/nekohasekai/sagernet/plugin/naive/BinaryProvider.kt
@ -0,0 +1,42 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (C) 2021 by nekohasekai <contact-sagernet@sekai.icu>             *
+ *                                                                            *
+ * This program 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.                                       *
+ *                                                                            *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                            *
+ ******************************************************************************/
+
+package io.nekohasekai.sagernet.plugin.naive
+
+import android.net.Uri
+import android.os.ParcelFileDescriptor
+import io.nekohasekai.sagernet.plugin.NativePluginProvider
+import io.nekohasekai.sagernet.plugin.PathProvider
+import java.io.File
+import java.io.FileNotFoundException
+
+class BinaryProvider : NativePluginProvider() {
+    override fun populateFiles(provider: PathProvider) {
+        provider.addPath("naive-plugin", 0b111101101)
+    }
+
+    override fun getExecutable() = context!!.applicationInfo.nativeLibraryDir + "/libnaive.so"
+    override fun openFile(uri: Uri): ParcelFileDescriptor = when (uri.path) {
+        "/naive-plugin" -> ParcelFileDescriptor.open(
+            File(getExecutable()),
+            ParcelFileDescriptor.MODE_READ_ONLY
+        )
+        else -> throw FileNotFoundException()
+    }
+}
--- a/apk/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/apk/app/src/main/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.13877095"
+      android:scaleY="0.13877095"
+      android:translateX="29.16"
+      android:translateY="42.010185">
+    <group android:translateY="138.67206">
+      <path android:pathData="M4.171875,-0L34.546875,-0L34.546875,-5.890625L25.90625,-7.046875L23.3125,-9.796875L23.3125,-82.125L78.1875,-0L87.6875,-0L87.6875,-87.328125L90.28125,-89.9375L98.921875,-91.234375L98.921875,-97L68.671875,-97L68.671875,-91.234375L77.3125,-89.9375L79.90625,-87.328125L79.90625,-19.34375L30.8125,-93.390625L30.8125,-97L3.734375,-97L3.734375,-91.234375L12.953125,-90.359375L15.546875,-88.34375L15.546875,-9.796875L12.953125,-7.046875L4.171875,-5.890625L4.171875,-0Z"
+          android:fillColor="#FFFFFF"/>
+      <path android:pathData="M151.09375,-8.375L152.95312,0L173.26562,0L173.26562,-5.171875L165.625,-5.90625L163.03125,-8.234375L163.03125,-50.3125C163.03125,-64.796875,156.70312,-71,141.57812,-71C123.4375,-71,112.5,-63.5,112.5,-54.75C112.5,-51.3125,113.640625,-50.3125,116.953125,-50.3125L126.890625,-50.3125L126.890625,-62.359375C130.78125,-63.9375,134.23438,-64.65625,137.84375,-64.65625C148.20312,-64.65625,151.09375,-59.921875,151.09375,-48.578125L151.09375,-44C122.28125,-37.0625,109.046875,-32.6875,109.046875,-17.546875C109.046875,-6.625,116.09375,1,127.46875,1C134.39062,1.015625,142.01562,-2.15625,151.09375,-8.375ZM151.09375,-13.328125C143.89062,-9.09375,137.98438,-6.765625,133.23438,-6.765625C126.03125,-6.765625,121.71875,-11.578125,121.71875,-18.703125C121.71875,-29.34375,130.78125,-33.265625,151.09375,-38.953125L151.09375,-13.328125Z"
+          android:fillColor="#FFFFFF"/>
+      <path android:pathData="M197.59375,-70L181.03125,-65L181.03125,-60.53125L191.10938,-60.53125L191.10938,-8.203125L188.65625,-5.90625L181.03125,-5.171875L181.03125,0L213.4375,0L213.4375,-5.171875L205.65625,-5.90625L203.20312,-8.203125L203.20312,-70L197.59375,-70ZM182.76562,-99.53125C178.73438,-99.53125,175.42188,-96.375,175.42188,-92.1875C175.42188,-88.15625,178.73438,-85,182.76562,-85C186.79688,-85,189.95312,-88.15625,189.95312,-92.1875C189.95312,-96.375,186.79688,-99.53125,182.76562,-99.53125ZM209.54688,-99.53125C205.51562,-99.53125,202.20312,-96.375,202.20312,-92.1875C202.20312,-88.15625,205.51562,-85,209.54688,-85C213.57812,-85,216.75,-88.15625,216.75,-92.1875C216.75,-96.375,213.57812,-99.53125,209.54688,-99.53125Z"
+          android:fillColor="#FFFFFF"/>
+      <path android:pathData="M215.26562,-69L215.26562,-63.671875L224.0625,-62.796875L247.23438,0L255.29688,0L280.5,-62.515625L289,-63.671875L289,-69L263.51562,-69L263.51562,-63.671875L271.28125,-63.09375L272.4375,-60.796875L254,-13.90625L237.15625,-60.796875L238.89062,-63.09375L246.51562,-63.671875L246.51562,-69L215.26562,-69Z"
+          android:fillColor="#FFFFFF"/>
+      <path android:pathData="M351.5,-15.5C343.29688,-10.0625,336.09375,-7.203125,328.89062,-7.203125C314.35938,-7.203125,304.70312,-18.078125,304.70312,-36.421875C304.70312,-36.84375,304.70312,-37.421875,304.70312,-38L351.35938,-38C351.5,-39.578125,351.5,-41.015625,351.5,-42.453125C351.5,-60.296875,341.28125,-71,325.57812,-71C306.28125,-71,292.3125,-56.09375,292.3125,-34.265625C292.3125,-13.21875,305.42188,1,324.4375,1C333.5,1,342.85938,-1.875,351.5,-7.625L351.5,-15.5ZM338.6875,-44.046875L305.42188,-44.046875C306.28125,-56.375,314.5,-64.515625,323.71875,-64.515625C333.35938,-64.515625,338.6875,-58.125,338.6875,-46.359375C338.6875,-45.640625,338.6875,-44.765625,338.6875,-44.046875Z"
+          android:fillColor="#FFFFFF"/>
+    </group>
+  </group>
+</vector>
--- a/apk/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/apk/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/apk/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/apk/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/apk/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/apk/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/apk/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/apk/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/apk/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/apk/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/apk/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/apk/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/apk/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/apk/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/apk/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/apk/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/apk/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/apk/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/apk/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/apk/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/apk/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/apk/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/apk/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/apk/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/apk/app/src/main/res/values/ic_launcher_background.xml
+++ b/apk/app/src/main/res/values/ic_launcher_background.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#E91E63</color>
+</resources>
--- a/apk/build.gradle
+++ b/apk/build.gradle
@ -0,0 +1,18 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
--- a/apk/gradle.properties
+++ b/apk/gradle.properties
@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
--- a/apk/gradle/wrapper/gradle-wrapper.jar
+++ b/apk/gradle/wrapper/gradle-wrapper.jar
--- a/apk/gradle/wrapper/gradle-wrapper.properties
+++ b/apk/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/apk/gradlew
+++ b/apk/gradlew
@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
--- a/apk/gradlew.bat
+++ b/apk/gradlew.bat
@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/apk/release.keystore
+++ b/apk/release.keystore
--- a/apk/settings.gradle
+++ b/apk/settings.gradle
@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "Naive Plugin"
+
+include ':app'
--- a/src/.clang-format
+++ b/src/.clang-format
@ -7,6 +7,51 @@ BasedOnStyle: Chromium
 # 'int>>' if the file already contains at least one such instance.)
 Standard: Cpp11

+# TODO(crbug.com/1392808): Remove when InsertBraces has been upstreamed into
+# the Chromium style (is implied by BasedOnStyle: Chromium).
+InsertBraces: true
+InsertNewlineAtEOF: true
+
+# Sort #includes by following
+# https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
+#
+# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeblocks
+IncludeBlocks: Regroup
+# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includecategories
+IncludeCategories:
+  # The win32 api has all sorts of implicit include order dependencies :-/
+  # Give a few headers special priorities that make sure they appear before
+  # all other headers.
+  # Sync this with SerializeIncludes in tools/add_header.py.
+  # TODO(crbug.com/329138753): remove include sorting from tools/add_header.py
+  # after confirming clang-format sort works well.
+  # LINT.IfChange(winheader)
+  - Regex:           '^<objbase\.h>' # This has to be before initguid.h.
+    Priority:        1
+  - Regex:           '^<(atlbase|initguid|mmdeviceapi|ocidl|ole2|shobjidl|tchar|unknwn|windows|winsock2|winternl|ws2tcpip)\.h>'
+    Priority:        2
+  # LINT.ThenChange(/tools/add_header.py:winheader)
+  # UIAutomation*.h needs to be after base/win/atl.h.
+  # Note the low priority number.
+  - Regex:           '^<UIAutomation.*\.h>'
+    Priority:        6
+  # Other C system headers.
+  - Regex:           '^<.*\.h>'
+    Priority:        3
+  # C++ standard library headers.
+  - Regex:           '^<.*>'
+    Priority:        4
+  # windows_h_disallowed.h should appear last. Note the low priority number.
+  - Regex:           '"(.*/)?windows_h_disallowed\.h"'
+    Priority:        7
+  # Other libraries.
+  - Regex:           '.*'
+    Priority:        5
+# ref: https://clang.llvm.org/docs/ClangFormatStyleOptions.html#includeismainregex
+IncludeIsMainRegex: "\
+(_(32|64|android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?\
+(_(unit|browser|perf)?tests?)?$"
+
 # Make sure code like:
 # IPC_BEGIN_MESSAGE_MAP()
 #   IPC_MESSAGE_HANDLER(WidgetHostViewHost_Update, OnUpdate)
--- a/src/.gitattributes
+++ b/src/.gitattributes
@ -5,24 +5,34 @@
 /net/http/*.pins  text eol=lf

 # Force LF checkout for all source files
+*.bin binary
 *.c text eol=lf
 *.cc text eol=lf
 *.cpp text eol=lf
+*.csv text eol=lf
 *.grd   text eol=lf
 *.grdp   text eol=lf
 *.gn text eol=lf
 *.gni text eol=lf
 *.h text eol=lf
 *.html   text eol=lf
+*.idl text eol=lf
 *.in   text eol=lf
 *.inc   text eol=lf
 *.java   text eol=lf
 *.js   text eol=lf
 *.json   text eol=lf
+*.json5 text eol=lf
 *.md text eol=lf
 *.mm text eol=lf
+*.mojom text eol=lf
+*.pdf -diff
+*.proto text eol=lf
+*.rs text eol=lf
 *.sh text eol=lf
+*.spec text eol=lf
 *.sql   text eol=lf
+*.toml  text eol=lf
 *.txt   text eol=lf
 *.xml   text eol=lf
 *.xslt   text eol=lf
@ -34,7 +44,7 @@
 .vpython   text eol=lf
 codereview.settings   text eol=lf
 DEPS   text eol=lf
-ENG_REVIEW_OWNERS   text eol=lf
+ATL_OWNERS   text eol=lf
 LICENSE text eol=lf
 LICENSE.* text eol=lf
 MAJOR_BRANCH_DATE   text eol=lf
@ -43,3 +53,7 @@ README   text eol=lf
 README.*   text eol=lf
 WATCHLISTS   text eol=lf
 VERSION   text eol=lf
+DIR_METADATA   text eol=lf
+
+# Skip Tricium by default on files in third_party.
+third_party/** -tricium
--- a/src/.gn
+++ b/src/.gn
@ -8,10 +8,9 @@ import("//third_party/angle/dotfile_settings.gni")
 # The location of the build configuration file.
 buildconfig = "//build/config/BUILDCONFIG.gn"

-# The secondary source root is a parallel directory tree where
-# GN build files are placed when they can not be placed directly
-# in the source tree, e.g. for third party source trees.
-secondary_source = "//build/secondary/"
+# The python interpreter to use by default. On Windows, this will look
+# for python3.exe and python3.bat.
+script_executable = "python3"

 # These arguments override the default values for items in a declare_args
 # block. "gn args" in turn can override these.
@ -34,31 +33,18 @@ default_args = {
  # also needs to be defined to src/ios/BUILD.gn (respectively removed from both
  # location when it is removed).

-  v8_extra_library_files = [
-    # Dependencies used by the extra libraries. Putting them here causes them
-    # to be executed first during snapshot creation.
-    "//third_party/blink/renderer/core/streams/CommonOperations.js",
-    "//third_party/blink/renderer/core/streams/CommonStrings.js",
-    "//third_party/blink/renderer/core/streams/SimpleQueue.js",
-
-    # Extra libraries.
-    "//third_party/blink/renderer/core/streams/ByteLengthQueuingStrategy.js",
-    "//third_party/blink/renderer/core/streams/CountQueuingStrategy.js",
-    "//third_party/blink/renderer/core/streams/ReadableStream.js",
-    "//third_party/blink/renderer/core/streams/WritableStream.js",
-    "//third_party/blink/renderer/core/streams/TransformStream.js",
-  ]
-  v8_experimental_extra_library_files = []
  v8_enable_gdbjit = false
  v8_imminent_deprecation_warnings = false

-  # TODO(jochen): Remove this. http://crbug.com/v8/5830,
-  # http://crbug.com/728583.
-  v8_check_microtasks_scopes_consistency = false
-
  # Don't include webrtc's builtin task queue implementation.
  rtc_link_task_queue_impl = false

+  # When building with Chromium, `webrtc::Location` is replaced by
+  # `base::Location`. Since WebRTC doesn't use `public_deps` (webrtc:8603), it
+  # would fail to propagate the dependency internally. Instead WebRTC let its
+  # embedders to define it globally for all of its targets.
+  rtc_common_public_deps = [ "//base" ]
+
  # Don't include the iLBC audio codec.
  # TODO(bugs.webrtc.org/8396): Once WebRTC gets rid of its internal
  # deps on codecs, we can remove this.
@ -67,289 +53,47 @@ default_args = {
  # Changes some setup for the Crashpad build to set them to build against
  # Chromium's zlib, base, etc.
  crashpad_dependencies = "chromium"
+
+  # Override ANGLE's Vulkan dependencies.
+  angle_vulkan_headers_dir = "//third_party/vulkan-headers/src"
+  angle_vulkan_loader_dir = "//third_party/vulkan-loader/src"
+  angle_vulkan_tools_dir = "//third_party/vulkan-tools/src"
+  angle_vulkan_validation_layers_dir =
+      "//third_party/vulkan-validation-layers/src"
+
+  # Override VMA's Vulkan dependencies.
+  vma_vulkan_headers_dir = "//third_party/vulkan-headers/src"
+
+  # Overwrite default args declared in the Fuchsia sdk
+  fuchsia_sdk_readelf_exec =
+      "//third_party/llvm-build/Release+Asserts/bin/llvm-readelf"
+
+  # Overwrite default args declared in the pdfium library
+  pdf_partition_alloc_dir = "//base/allocator/partition_allocator"
+
+  devtools_visibility = [ "*" ]
+
+  clang_unsafe_buffers_paths = "//build/config/unsafe_buffers_paths.txt"
 }

-# These are the targets to check headers for by default. The files in targets
-# matching these patterns (see "gn help label_pattern" for format) will have
+# These are the targets to skip header checking by default. The files in targets
+# matching these patterns (see "gn help label_pattern" for format) will not have
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
-check_targets = [
-  "//apps/*",
-  "//ash/*",
-  "//base/*",
-  "//blink/*",
-  "//build/*",
-  "//cc/*",
-
-  #"//chrome/android/*",  # 13 errors
-  "//chrome/app/*",
-  "//chrome/app_shim/*",
-
-  #"//chrome/browser/*",  # ~1300 errors
-  #"//chrome/browser:*",  # ~600 errors
-  "//chrome/browser/accessibility/*",
-  "//chrome/browser/android/*",
-  "//chrome/browser/app_mode/*",
-  "//chrome/browser/apps/*",
-  "//chrome/browser/assist_ranker/*",
-  "//chrome/browser/autocomplete/*",
-  "//chrome/browser/autofill/*",
-  "//chrome/browser/background/*",
-  "//chrome/browser/background_fetch/*",
-  "//chrome/browser/background_sync/*",
-  "//chrome/browser/banners/*",
-  "//chrome/browser/bitmap_fetcher/*",
-  "//chrome/browser/bookmarks/*",
-  "//chrome/browser/browsing_data/*",
-  "//chrome/browser/budget_service/*",
-  "//chrome/browser/captive_portal/*",
-  "//chrome/browser/chooser_controller/*",
-  "//chrome/browser/chromeos/*",
-  "//chrome/browser/client_hints/*",
-  "//chrome/browser/clipboard/*",
-  "//chrome/browser/component_updater/*",
-  "//chrome/browser/conflicts/*",
-  "//chrome/browser/consent_auditor/*",
-  "//chrome/browser/content_settings/*",
-  "//chrome/browser/crash_upload_list/*",
-  "//chrome/browser/custom_handlers/*",
-  "//chrome/browser/data_saver/*",
-  "//chrome/browser/data_use_measurement/*",
-  "//chrome/browser/dbus/*",
-
-  #"//chrome/browser/devtools/*",  # 93 errors
-  "//chrome/browser/diagnostics/*",
-  "//chrome/browser/domain_reliability/*",
-  "//chrome/browser/dom_distiller/*",
-  "//chrome/browser/downgrade/*",
-  "//chrome/browser/download/*",
-  "//chrome/browser/drive/*",
-  "//chrome/browser/engagement/*",
-  "//chrome/browser/extensions/*",
-  "//chrome/browser/external_protocol/*",
-  "//chrome/browser/favicon/*",
-  "//chrome/browser/feature_engagement/*",
-  "//chrome/browser/feedback/*",
-  "//chrome/browser/first_run/*",
-  "//chrome/browser/gcm/*",
-  "//chrome/browser/generic_sensor/*",
-  "//chrome/browser/geolocation/*",
-  "//chrome/browser/google/*",
-  "//chrome/browser/gpu/*",
-  "//chrome/browser/guest_view/*",
-  "//chrome/browser/hang_monitor/*",
-  "//chrome/browser/history/*",
-  "//chrome/browser/importer/*",
-  "//chrome/browser/infobars/*",
-  "//chrome/browser/installable/*",
-  "//chrome/browser/install_verification/*",
-  "//chrome/browser/internal/*",
-  "//chrome/browser/interstitials/*",
-  "//chrome/browser/invalidation/*",
-  "//chrome/browser/language/*",
-  "//chrome/browser/lifetime/*",
-
-  #"//chrome/browser/loader/*",  # 2 errors
-  "//chrome/browser/local_discovery/*",
-  "//chrome/browser/mac/*",
-
-  #"//chrome/browser/media/*",  # 74 errors
-  "//chrome/browser/media_galleries/*",
-  "//chrome/browser/memory/*",
-  "//chrome/browser/metrics/*",
-  "//chrome/browser/nacl_host/*",
-  "//chrome/browser/navigation_predictor/*",
-  "//chrome/browser/net/*",
-  "//chrome/browser/notifications/*",
-  "//chrome/browser/ntp_snippets/*",
-  "//chrome/browser/ntp_tiles/*",
-  "//chrome/browser/obsolete_system/*",
-  "//chrome/browser/offline_items_collection/*",
-  "//chrome/browser/offline_pages/*",
-  "//chrome/browser/page_load_metrics/*",
-  "//chrome/browser/password_manager/*",
-  "//chrome/browser/payments/*",
-  "//chrome/browser/pdf/*",
-  "//chrome/browser/performance_monitor/*",
-  "//chrome/browser/permissions/*",
-  "//chrome/browser/picture_in_picture/*",
-  "//chrome/browser/plugins/*",
-
-  # "//chrome/browser/policy/*",  # 1 error on Windows
-  "//chrome/browser/predictors/*",
-  "//chrome/browser/prefetch/*",
-  "//chrome/browser/prefs/*",
-  "//chrome/browser/prerender/*",
-  "//chrome/browser/previews/*",
-  "//chrome/browser/printing/*",
-  "//chrome/browser/profile_resetter/*",
-  "//chrome/browser/profiles/*",
-
-  #"//chrome/browser/profiling_host/*",  # 16 errors
-  "//chrome/browser/push_messaging/*",
-  "//chrome/browser/recovery/*",
-  "//chrome/browser/renderer_context_menu/*",
-  "//chrome/browser/renderer_host/*",
-  "//chrome/browser/resource_coordinator/*",
-
-  #"//chrome/browser/resources/*",  # 18 errors on ChromeOS
-  "//chrome/browser/rlz/*",
-
-  #"//chrome/browser/safe_browsing/*",  # 239 errors
-  "//chrome/browser/search/*",
-  "//chrome/browser/search_engines/*",
-  "//chrome/browser/search_provider_logos/*",
-  "//chrome/browser/service_process/*",
-  "//chrome/browser/sessions/*",
-  "//chrome/browser/signin/*",
-  "//chrome/browser/speech/*",
-  "//chrome/browser/spellchecker/*",
-  "//chrome/browser/ssl/*",
-  "//chrome/browser/status_icons/*",
-  "//chrome/browser/storage/*",
-  "//chrome/browser/subresource_filter/*",
-  "//chrome/browser/supervised_user/*",
-  "//chrome/browser/sync/*",
-  "//chrome/browser/sync_file_system/*",
-  "//chrome/browser/tab_contents/*",
-  "//chrome/browser/task_manager/*",
-  "//chrome/browser/themes/*",
-  "//chrome/browser/thumbnails/*",
-  "//chrome/browser/tracing/*",
-  "//chrome/browser/translate/*",
-  "//chrome/browser/ui/*",
-  "//chrome/browser/undo/*",
-  "//chrome/browser/unified_consent/*",
-  "//chrome/browser/update_client/*",
-  "//chrome/browser/upgrade_detector/*",
-  "//chrome/browser/usb/*",
-  "//chrome/browser/vr/*",
-  "//chrome/browser/web_applications/*",
-  "//chrome/browser/webauthn/*",
-  "//chrome/browser/webshare/*",
-  "//chrome/browser/win/*",
-
-  "//chrome/build/*",
-
-  #"//chrome/child/*",  # 1 error on Windows
-  "//chrome/chrome_cleaner/*",
-
-  #"//chrome/chrome_watcher/*",  # 3 errors on Windows
-  "//chrome/common/*",
-
-  #"//chrome/elevation_service/*",  # 1 error on Windows
-  #"//chrome/gpu/*",  # 7 errors
-  "//chrome/installer/*",
-
-  #"//chrome/install_static/*",  # 8 errors on Windows
-  "//chrome/nacl/*",
-
-  #"//chrome/notification_helper/*",  # 4 errors on Windows
-  #"//chrome/renderer/*",  # ~30 errors
-  #"//chrome/service/*",  # 2 errors
-  #"//chrome/services/*",  # ~30 errors
-  #"//chrome/test/*",  # ~3000 errors
-  "//chrome/third_party/*",
-  "//chrome/tools/*",
-  "//chrome/utility/*",
-
-  "//chromecast/*",
-  "//chromeos/*",
-  "//chrome_elf/*",
-  "//cloud_print/*",
-  "//components/*",
-  "//content/*",
-  "//courgette/*",
-  "//crypto/*",
-  "//data/*",
-  "//dbus/*",
-  "//device/*",
-
-  #"//extensions/*",  # Lots of errors.
-  "//extensions:extensions_resources",
-  "//extensions:extensions_browsertests",
-  "//extensions:extensions_unittests",
-  "//extensions/browser",
-  "//extensions/browser:browser_tests",
-  "//extensions/browser:unit_tests",
-  "//extensions/browser/install:*",
-  "//extensions/common/*",
-  "//extensions/components/javascript_dialog_extensions_client",
-  "//extensions/components/native_app_window",
-  "//extensions/renderer:unit_tests",
-  "//extensions/shell/*",
-  "//extensions/strings/*",
-  "//gin/*",
-  "//google_apis/*",
-  "//google_update/*",
-  "//gpu/*",
-
-  "//ios/*",
-  "//ios_internal/*",
-  "//ipc/*",
-
-  #"//jingle/*",
-  "//mash/*",
-
-  "//media/*",
-  "//mojo/*",
-
-  #"//native_client/*",
-  "//net/*",
-
-  #"//pdf/*",  # Medium-hard.
-  #"//ppapi/*",  # Lots of errors.
-  "//ppapi/examples/*",
-  "//ppapi/tests/*",
-  "//printing/*",
-
-  #"//remoting/*",  # Medium-hard.
-  "//rlz/*",
-
-  #"//sandbox/*",  # Medium-hard.
-  "//services/*",
-  "//skia/*",
-  "//sql/*",
-  "//storage/*",
-  "//testing/*",
-
-  #"//third_party/*",  # May not ever want this.
-  #"//third_party/breakpad/*",  # Small errors.
-  "//third_party/boringssl/*",
-  "//third_party/brotli/*",
-  "//third_party/fuchsia-sdk/*",
-  "//third_party/hunspell/*",
-  "//third_party/leveldatabase/*",
-
-  #"//third_party/libaddressinput/*",  # Small errors.
-  "//third_party/libphonenumber/*",
-
-  #"//third_party/libwebp/*",  # Errors: https://crbug.com/800762
-  "//third_party/snappy/*",
-
-  #"//third_party/WebKit/*",  # Errors: https://crbug.com/800764
-  "//third_party/webrtc/*",
-  "//third_party/webrtc_overrides/*",
-  "//tools/*",
-
-  "//ui/*",
-  "//url/*",
-
-  #"//v8/*",  # Errors: https://bugs.chromium.org/p/v8/issues/detail?id=7330
-  "//webrunner/*",
+no_check_targets = [
+  # //v8, https://crbug.com/v8/7330
+  "//v8/src/inspector:inspector",  # 20 errors
+  "//v8/test/cctest:cctest_sources",  # 15 errors
+  "//v8/test/unittests:inspector_unittests_sources",  # 2 errors
+  "//v8:cppgc_base",  # 1 error
+  "//v8:v8_internal_headers",  # 11 errors
+  "//v8:v8_libplatform",  # 2 errors
 ]

-# These are the list of GN files that run exec_script. This whitelist exists
+# These are the list of GN files that run exec_script. This allowlist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged.
 #
-# GYPI_TO_GN
-#
-# Some of these entries are for legacy gypi_to_gn calls. We should not be
-# adding new calls to this script in the build (see //build/gypi_to_gn.py for
-# detailed advice). The only time you should be editing this list for
-# gypi_to_gn purposes is when moving an existing call to a different place.
-#
 # PLEASE READ
 #
 # You should almost never need to add new exec_script calls. exec_script is
@ -401,32 +145,31 @@ check_targets = [
 #      this situation much easier to create. if the build always lists the
 #      files and passes them to a script, it will always be correct.

-exec_script_whitelist =
-    build_dotfile_settings.exec_script_whitelist +
+exec_script_allowlist =
+    build_dotfile_settings.exec_script_allowlist +
    angle_dotfile_settings.exec_script_whitelist +
    [
-      # Whitelist entries for //build should go into
+      # Allowlist entries for //build should go into
      # //build/dotfile_settings.gni instead, so that they can be shared
      # with other repos. The entries in this list should be only for files
      # in the Chromium repo outside of //build.
      "//build_overrides/build.gni",

+      "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
+      "//chrome/version.gni",
+
      # TODO(dgn): Layer violation but breaks the build otherwise, see
      # https://crbug.com/474506.
      "//clank/java/BUILD.gn",
      "//clank/native/BUILD.gn",

+      "//google_apis/BUILD.gn",
+      "//printing/BUILD.gn",
+
      "//remoting/host/installer/linux/BUILD.gn",
      "//remoting/remoting_version.gni",
      "//remoting/host/installer/win/generate_clsids.gni",

-      # TODO(dpranke): Get these from the appropriate repos instead.
-      "//third_party/catapult/tracing/BUILD.gn",
-      "//third_party/google_input_tools/inputview.gni",
-
      "//tools/grit/grit_rule.gni",
-
-      # Not gypi-to-gn.
-      "//google_apis/BUILD.gn",
-      "//printing/BUILD.gn",
+      "//tools/gritsettings/BUILD.gn",
    ]
--- a/src/AUTHORS
+++ b/src/AUTHORS
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
--- a/src/DEPS
+++ b/src/DEPS
--- a/src/LICENSE
+++ b/src/LICENSE
@ -1,4 +1,4 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@ -10,7 +10,7 @@
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
-//    * Neither the name of Google Inc. nor the names of its
+//    * Neither the name of Google LLC nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
--- a/src/android_webview/BUILD.gn
+++ b/src/android_webview/BUILD.gn
--- a/src/android_webview/apk/BUILD.gn
+++ b/src/android_webview/apk/BUILD.gn
@ -1,15 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-# Since Monochrome has its own content provider, these two files are put
-# in two different targets.
-android_library("webview_license_provider_java") {
-  java_files = [ "//android_webview/apk/java/src/com/android/webview/chromium/LicenseContentProvider.java" ]
-}
-
-android_library("webview_license_activity_java") {
-  java_files = [ "//android_webview/apk/java/src/com/android/webview/chromium/LicenseActivity.java" ]
-}
--- a/src/android_webview/glue/BUILD.gn
+++ b/src/android_webview/glue/BUILD.gn
@ -1,71 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//android_webview/system_webview_apk_tmpl.gni")
-import("//android_webview/variables.gni")
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-import("generate_resource_rewriter.gni")
-import("glue.gni")
-
-generate_resource_rewriter("glue_resource_rewriter") {
-  # Change deps? please modify glue_library_deps variable.
-  deps = glue_library_deps
-  package_name = "com.android.webview.chromium"
-}
-
-android_library("glue") {
-  # Change deps? please modify glue_library_deps variable.
-  deps = glue_library_deps
-  srcjar_deps = [ ":glue_resource_rewriter" ]
-
-  alternative_android_sdk_dep =
-      "//third_party/android_system_sdk:public_framework_system_java"
-
-  java_files = [
-    "java/src/com/android/webview/chromium/CallbackConverter.java",
-    "java/src/com/android/webview/chromium/ContentSettingsAdapter.java",
-    "java/src/com/android/webview/chromium/CookieManagerAdapter.java",
-    "java/src/com/android/webview/chromium/DrawGLFunctor.java",
-    "java/src/com/android/webview/chromium/FontPreloadingWorkaround.java",
-    "java/src/com/android/webview/chromium/GeolocationPermissionsAdapter.java",
-    "java/src/com/android/webview/chromium/GlueApiHelperForM.java",
-    "java/src/com/android/webview/chromium/GlueApiHelperForN.java",
-    "java/src/com/android/webview/chromium/GlueApiHelperForO.java",
-    "java/src/com/android/webview/chromium/GlueApiHelperForOMR1.java",
-    "java/src/com/android/webview/chromium/GlueApiHelperForP.java",
-    "java/src/com/android/webview/chromium/GraphicsUtils.java",
-    "java/src/com/android/webview/chromium/MonochromeLibraryPreloader.java",
-    "java/src/com/android/webview/chromium/SafeBrowsingResponseAdapter.java",
-    "java/src/com/android/webview/chromium/ServiceWorkerClientAdapter.java",
-    "java/src/com/android/webview/chromium/ServiceWorkerControllerAdapter.java",
-    "java/src/com/android/webview/chromium/ServiceWorkerSettingsAdapter.java",
-    "java/src/com/android/webview/chromium/SharedStatics.java",
-    "java/src/com/android/webview/chromium/SharedTracingControllerAdapter.java",
-    "java/src/com/android/webview/chromium/SplitApkWorkaround.java",
-    "java/src/com/android/webview/chromium/TokenBindingManagerAdapter.java",
-    "java/src/com/android/webview/chromium/TracingControllerAdapter.java",
-    "java/src/com/android/webview/chromium/WebBackForwardListChromium.java",
-    "java/src/com/android/webview/chromium/WebHistoryItemChromium.java",
-    "java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java",
-    "java/src/com/android/webview/chromium/WebMessagePortAdapter.java",
-    "java/src/com/android/webview/chromium/WebResourceErrorAdapter.java",
-    "java/src/com/android/webview/chromium/WebResourceRequestAdapter.java",
-    "java/src/com/android/webview/chromium/WebStorageAdapter.java",
-    "java/src/com/android/webview/chromium/WebkitToSharedGlueConverter.java",
-    "java/src/com/android/webview/chromium/WebViewApplication.java",
-    "java/src/com/android/webview/chromium/WebViewChromiumAwInit.java",
-    "java/src/com/android/webview/chromium/WebViewChromium.java",
-    "java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java",
-    "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForO.java",
-    "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForOMR1.java",
-    "java/src/com/android/webview/chromium/WebViewChromiumFactoryProviderForP.java",
-    "java/src/com/android/webview/chromium/SharedWebViewChromium.java",
-    "java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java",
-    "java/src/com/android/webview/chromium/WebViewDatabaseAdapter.java",
-    "java/src/com/android/webview/chromium/WebViewDelegateFactory.java",
-  ]
-
-  android_manifest_for_lint = system_webview_android_manifest
-}
--- a/src/android_webview/glue/generate_resource_rewriter.gni
+++ b/src/android_webview/glue/generate_resource_rewriter.gni
@ -1,55 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-# Generate ResourceRewriter.java from Android Libraries according the dep
-# graph.
-# Argument:
-#   deps
-#     The same deps of target that uses the generated ResourceRewriter.
-#   package_name
-#     The package name of ResourceRewriter.java.
-#
-# This target generates a single srcjar containing generated
-# ResourceRewrite.java which will list the R classes generated by all the
-# Android libraries reachabled from the target specified in deps. Add this
-# target to srcjar_deps of android_library will call  ResourceRewriter.
-#
-template("generate_resource_rewriter") {
-  set_sources_assignment_filter([])
-  assert(defined(invoker.package_name))
-
-  _final_target_name = target_name
-  _build_config = "$target_gen_dir/${target_name}.build_config"
-  _build_config_target_name = "${target_name}__build_config"
-  _srcjar = "$target_gen_dir/${target_name}.srcjar"
-  write_build_config(_build_config_target_name) {
-    possible_config_deps = invoker.deps
-    type = "resource_rewriter"
-    build_config = _build_config
-  }
-
-  action(_final_target_name) {
-    forward_variables_from(invoker, [ "visibility" ])
-    inputs = [
-      _build_config,
-    ]
-    deps = invoker.deps + [ ":${_build_config_target_name}" ]
-    script = "//build/android/gyp/generate_resource_rewriter.py"
-
-    _rebased_build_config = rebase_path(_build_config, root_build_dir)
-    args = [
-      "--package-name",
-      invoker.package_name,
-      "--dep-packages",
-      "@FileArg($_rebased_build_config:resources:extra_package_names)",
-      "--srcjar",
-      rebase_path(_srcjar, root_build_dir),
-    ]
-    outputs = [
-      _srcjar,
-    ]
-  }
-}
--- a/src/android_webview/glue/glue.gni
+++ b/src/android_webview/glue/glue.gni
@ -1,20 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This variable shared between 'glue' and 'glue_resource_rewriter' because
-# ResourceRewrite.java need to be generated according 'glue' deps.
-glue_library_deps = [
-  "//android_webview:android_webview_java",
-  "//android_webview:android_webview_commandline_java",
-  "//android_webview:android_webview_platform_services_java",
-  "//android_webview:system_webview_manifest",
-  "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
-  "//android_webview/support_library/callback:callback_java",
-  "//base:base_java",
-  "//components/autofill/android:autofill_java",
-  "//components/autofill/android:provider_java",
-  "//content/public/android:content_java",
-  "//net/android:net_java",
-  "//ui/android:ui_java",
-]
--- a/src/android_webview/proto/BUILD.gn
+++ b/src/android_webview/proto/BUILD.gn
@ -1,10 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-
-proto_java_library("aw_variations_seed_proto_java") {
-  proto_path = "."
-  sources = [ "aw_variations_seed.proto" ]
-}
--- a/src/android_webview/support_library/BUILD.gn
+++ b/src/android_webview/support_library/BUILD.gn
@ -1,33 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-
-android_library("support_lib_glue_java") {
-  java_files = [
-    "java/src/org/chromium/support_lib_glue/IsomorphicAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibReflectionUtil.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerClientAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerControllerAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibServiceWorkerSettingsAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibTracingControllerAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebMessageCallbackAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebMessagePortAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebResourceRequest.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebSettingsAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebViewChromium.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebViewRendererAdapter.java",
-    "java/src/org/chromium/support_lib_glue/SupportLibWebkitToCompatConverterAdapter.java",
-  ]
-
-  deps = [
-    "//android_webview:android_webview_commandline_java",
-    "//android_webview:android_webview_java",
-    "//android_webview/glue:glue",
-    "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
-    "//base:base_java",
-  ]
-}
--- a/src/android_webview/support_library/boundary_interfaces/BUILD.gn
+++ b/src/android_webview/support_library/boundary_interfaces/BUILD.gn
@ -1,43 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-
-android_library("boundary_interface_java") {
-  java_files = [
-    "src/org/chromium/support_lib_boundary/FeatureFlagHolderBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/IsomorphicObjectBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/SafeBrowsingResponseBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/ServiceWorkerClientBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/ServiceWorkerControllerBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/ServiceWorkerWebSettingsBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/StaticsBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/TracingControllerBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebMessageBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebMessageCallbackBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebMessagePortBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebResourceErrorBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebResourceRequestBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebViewClientBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebViewRendererBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/WebkitToCompatConverterBoundaryInterface.java",
-    "src/org/chromium/support_lib_boundary/util/BoundaryInterfaceReflectionUtil.java",
-    "src/org/chromium/support_lib_boundary/util/Features.java",
-  ]
-
-  proguard_configs = [ "proguard.flags" ]
-
-  # We can't use ANY deps here, the support library should be able to build
-  # these interfaces without any other chromium dependencies.
-  deps = []
-
-  # This is to verify the boundary interfaces compile and lint correctly against
-  # the minSdkVersion of the webkit support library module.
-  android_manifest_for_lint = "AndroidManifest.xml"
-}
--- a/src/android_webview/support_library/callback/BUILD.gn
+++ b/src/android_webview/support_library/callback/BUILD.gn
@ -1,21 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-
-android_library("callback_java") {
-  java_files = [
-    "java/src/org/chromium/support_lib_callback_glue/SupportLibSafeBrowsingResponse.java",
-    "java/src/org/chromium/support_lib_callback_glue/SupportLibWebResourceError.java",
-    "java/src/org/chromium/support_lib_callback_glue/SupportLibWebViewContentsClientAdapter.java",
-  ]
-
-  deps = [
-    "//android_webview:android_webview_commandline_java",
-    "//android_webview:android_webview_java",
-    "//android_webview/support_library/boundary_interfaces:boundary_interface_java",
-    "//base:base_java",
-  ]
-}
--- a/src/android_webview/system_webview_apk_tmpl.gni
+++ b/src/android_webview/system_webview_apk_tmpl.gni
@ -1,93 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//base/android/proguard/proguard.gni")
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-import("//build/config/locales.gni")
-
-template("system_webview_apk_tmpl") {
-  android_apk(target_name) {
-    forward_variables_from(invoker, "*")
-
-    deps += [
-      "//android_webview:assets",
-      "//android_webview/apk:webview_license_activity_java",
-      "//android_webview/apk:webview_license_provider_java",
-      "//android_webview/glue",
-      "//android_webview/support_library:support_lib_glue_java",
-      "//base:base_java",
-    ]
-
-    if (!defined(alternative_android_sdk_dep)) {
-      alternative_android_sdk_dep = webview_framework_dep
-    }
-
-    shared_resources = true
-
-    if (!defined(use_trichrome_library) || !use_trichrome_library) {
-      shared_libraries = [ "//android_webview:libwebviewchromium" ]
-      if (build_apk_secondary_abi && android_64bit_target_cpu) {
-        secondary_abi_shared_libraries = [ "//android_webview:libwebviewchromium($android_secondary_abi_toolchain)" ]
-      }
-    } else {
-      # Include placeholder libraries to ensure we are treated as the desired
-      # architecture.
-      if (android_64bit_target_cpu) {
-        shared_libraries = [ "//android_webview:monochrome" ]
-        if (build_apk_secondary_abi) {
-          secondary_native_lib_placeholders = [ "libdummy.so" ]
-        }
-      } else {
-        native_lib_placeholders = [ "libdummy.so" ]
-      }
-    }
-
-    if (!defined(use_trichrome_library) || !use_trichrome_library ||
-        android_64bit_target_cpu) {
-      # 32-bit TrichromeWebView doesn't have a native library, so only do this
-      # for other configs.
-      native_lib_version_rule = "//build/util:chrome_version_json"
-      _native_lib_file =
-          rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
-      native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
-    }
-
-    aapt_locale_whitelist = locales
-
-    resource_blacklist_regex = "[/-]xxxhdpi[/-]"
-
-    # Exception rationale in https://crbug.com/691733.
-    resource_blacklist_exceptions = [
-      "*shadow*",  # Combination of gradient & transparency cause pixelation.
-      "*.9.*",  # Most nine-patches contain shadows.
-    ]
-
-    # Used as an additional apk in test scripts.
-    never_incremental = true
-
-    if (is_java_debug) {
-      enable_multidex = true
-    } else {
-      proguard_enabled = true
-      if (!defined(proguard_configs)) {
-        proguard_configs = []
-      }
-      proguard_configs += [
-        "//android_webview/apk/java/proguard.flags",
-        "//base/android/proguard/chromium_apk.flags",
-        "//base/android/proguard/chromium_code.flags",
-      ]
-      if (enable_proguard_obfuscation) {
-        proguard_configs +=
-            [ "//base/android/proguard/enable_obfuscation.flags" ]
-      } else {
-        proguard_configs +=
-            [ "//base/android/proguard/disable_all_obfuscation.flags" ]
-      }
-      png_to_webp = true
-    }
-    command_line_flags_file = "webview-command-line"
-  }
-}
--- a/src/android_webview/test/BUILD.gn
+++ b/src/android_webview/test/BUILD.gn
@ -1,383 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//device/vr/buildflags/buildflags.gni")
-import("//testing/test.gni")
-import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-
-# Mark all targets as test only.
-testonly = true
-
-group("test") {
-  deps = [
-    ":android_webview_unittests",
-    ":webview_instrumentation_test_apk",
-  ]
-}
-
-group("webview_cts_tests") {
-  _py_files = read_file("//android_webview/tools/run_cts.pydeps", "list lines")
-  deps = [
-    "//android_webview:system_webview_apk",
-  ]
-
-  data_deps = [
-    "//build/android:logdog_wrapper_py",
-    "//build/android:test_runner_py",
-  ]
-
-  # Filter out comments.
-  set_sources_assignment_filter([ "#*" ])
-  sources = _py_files
-
-  data = sources
-  data += [ "//android_webview/tools/cts_config/" ]
-}
-
-android_apk("webview_instrumentation_apk") {
-  deps = [
-    ":android_webview_apk_assets",
-    ":android_webview_apk_resources",
-    "//android_webview:android_webview_java",
-    "//android_webview:locale_pak_assets",
-    "//android_webview:platform_service_bridge_upstream_implementation_java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//components/heap_profiling:heap_profiling_java_test_support",
-    "//components/policy/android:policy_java_test_support",
-    "//content/public/android:content_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-    "//ui/android:ui_java",
-  ]
-
-  apk_name = "WebViewInstrumentation"
-  android_manifest = "shell/AndroidManifest.xml"
-  java_files = [
-    "shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
-    "shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
-    "shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
-    "shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
-    "shell/src/org/chromium/android_webview/shell/DrawGL.java",
-    "shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
-    "shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
-    "shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",
-    "shell/src/org/chromium/android_webview/test/NullContentsClient.java",
-    "shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
-    "shell/src/org/chromium/android_webview/test/OnlyRunIn.java",
-    "shell/src/org/chromium/android_webview/test/TestContentProvider.java",
-  ]
-
-  shared_libraries = [
-    ":libdrawgl",
-    ":libstandalonelibwebviewchromium",
-  ]
-
-  native_lib_version_rule = "//build/util:chrome_version_json"
-  _native_lib_file =
-      rebase_path("$root_gen_dir/CHROME_VERSION.json", root_build_dir)
-  native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
-
-  enable_multidex = true
-
-  command_line_flags_file = "android-webview-command-line"
-}
-
-android_resources("android_webview_apk_resources") {
-  resource_dirs = [ "shell/res" ]
-  custom_package = "org.chromium.android_webview.shell"
-}
-
-android_assets("android_webview_apk_assets") {
-  deps = [
-    "//android_webview:pak_file_assets",
-    "//third_party/icu:icu_assets",
-  ]
-
-  sources = [
-    "shell/assets/asset_file.html",
-    "shell/assets/asset_icon.png",
-    "shell/assets/autofill.html",
-    "shell/assets/cookie_test.html",
-    "shell/assets/full_screen_video.js",
-    "shell/assets/full_screen_video_inside_div_test.html",
-    "shell/assets/full_screen_video_test.html",
-    "shell/assets/full_screen_video_test_not_preloaded.html",
-    "shell/assets/key-system-test.html",
-    "shell/assets/platform-media-codec-test.html",
-    "shell/assets/star.svg",
-    "shell/assets/star.svgz",
-    "shell/assets/video.3gp",
-    "shell/assets/video.webm",
-    "shell/assets/visual_state_during_fullscreen_test.html",
-    "shell/assets/visual_state_on_page_commit_visible_test.html",
-    "shell/assets/visual_state_waits_for_js_detached_test.html",
-    "shell/assets/visual_state_waits_for_js_test.html",
-    "shell/assets/webvr_not_functional_test.html",
-  ]
-
-  if (use_v8_context_snapshot) {
-    deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
-  } else {
-    deps += [ "//v8:v8_external_startup_data_assets" ]
-  }
-}
-
-shared_library("libstandalonelibwebviewchromium") {
-  testonly = true
-  sources = [
-    "../lib/webview_entry_point.cc",
-  ]
-  ldflags = [ "-Wl,-shared,-Bsymbolic" ]
-  deps = [
-    "//android_webview:common",
-    "//components/heap_profiling:test_support",
-    "//components/minidump_uploader",
-  ]
-  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-  configs += [ "//build/config/android:hide_all_but_jni" ]
-}
-
-instrumentation_test_apk("webview_instrumentation_test_apk") {
-  apk_name = "WebViewInstrumentationTest"
-  apk_under_test = ":webview_instrumentation_apk"
-  android_manifest = "../javatests/AndroidManifest.xml"
-  deps = [
-    "//android_webview:android_webview_java",
-    "//android_webview:android_webview_platform_services_java",
-    "//android_webview:android_webview_services_java",
-    "//android_webview:aw_variations_seed_server_aidl",
-    "//android_webview/test/embedded_test_server:aw_net_java_test_support",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//components/autofill/android:provider_java",
-    "//components/embedder_support/android:web_contents_delegate_java",
-    "//components/minidump_uploader:minidump_uploader_java",
-    "//components/minidump_uploader:minidump_uploader_javatests",
-    "//components/policy/android:policy_java",
-    "//components/policy/android:policy_java_test_support",
-    "//components/safe_browsing/android:safe_browsing_java",
-    "//content/public/android:content_java",
-    "//content/public/test/android:content_java_test_support",
-    "//mojo/public/java:bindings_java",
-    "//net/android:net_java",
-    "//net/android:net_java_test_support",
-    "//services/device/public/java:geolocation_java",
-    "//services/device/public/java:geolocation_java_test_support",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-    "//ui/android:ui_java",
-  ]
-  java_files = [
-    "../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AndroidProtocolHandlerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ArchiveTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwActivityTestRule.java",
-    "../javatests/src/org/chromium/android_webview/test/AwAutocompleteTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwAutofillTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsAnchorViewTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientAutoLoginTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientFaviconTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnRenderProcessGoneTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientOnUnhandledKeyEventTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsContainerViewTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsGarbageCollectionTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsRenderTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwContentsTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwDebugTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwFormDatabaseTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwImeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwLayoutSizerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwPermissionManagerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwSecondBrowserProcessTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwSettingsTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwStrictModeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwVariationsSeedFetcherTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwZoomTest.java",
-    "../javatests/src/org/chromium/android_webview/test/CleanupReferenceTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClearHistoryTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientAddMessageToConsoleTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientOnPageFinishedTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientOnPageStartedTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedError2Test.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedErrorTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ClientOnReceivedHttpErrorTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ConsoleMessagesForBlockedLoadsTest.java",
-    "../javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java",
-    "../javatests/src/org/chromium/android_webview/test/CookieManagerStartupTest.java",
-    "../javatests/src/org/chromium/android_webview/test/CookieManagerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/DisableHardwareAccelerationForTest.java",
-    "../javatests/src/org/chromium/android_webview/test/FindAddressTest.java",
-    "../javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java",
-    "../javatests/src/org/chromium/android_webview/test/GeolocationTest.java",
-    "../javatests/src/org/chromium/android_webview/test/GetTitleTest.java",
-    "../javatests/src/org/chromium/android_webview/test/HeapProfilingTest.java",
-    "../javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java",
-    "../javatests/src/org/chromium/android_webview/test/HttpCacheTest.java",
-    "../javatests/src/org/chromium/android_webview/test/KeySystemTest.java",
-    "../javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java",
-    "../javatests/src/org/chromium/android_webview/test/LoadUrlTest.java",
-    "../javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java",
-    "../javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java",
-    "../javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java",
-    "../javatests/src/org/chromium/android_webview/test/PolicyUrlFilteringTest.java",
-    "../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
-    "../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
-    "../javatests/src/org/chromium/android_webview/test/RenderProcessGoneHelper.java",
-    "../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
-    "../javatests/src/org/chromium/android_webview/test/SafeBrowsingTest.java",
-    "../javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java",
-    "../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
-    "../javatests/src/org/chromium/android_webview/test/TestAwContents.java",
-    "../javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java",
-    "../javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java",
-    "../javatests/src/org/chromium/android_webview/test/UserAgentTest.java",
-    "../javatests/src/org/chromium/android_webview/test/VariationsSeedHolderTest.java",
-    "../javatests/src/org/chromium/android_webview/test/VariationsSeedLoaderTest.java",
-    "../javatests/src/org/chromium/android_webview/test/VariationsUtilsTest.java",
-    "../javatests/src/org/chromium/android_webview/test/VisualStateTest.java",
-    "../javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java",
-    "../javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java",
-    "../javatests/src/org/chromium/android_webview/test/WebViewFindApisTestRule.java",
-    "../javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java",
-    "../javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java",
-    "../javatests/src/org/chromium/android_webview/test/services/CrashReceiverServiceTest.java",
-    "../javatests/src/org/chromium/android_webview/test/services/MinidumpUploaderTest.java",
-    "../javatests/src/org/chromium/android_webview/test/services/MockVariationsSeedServer.java",
-    "../javatests/src/org/chromium/android_webview/test/services/VariationsSeedServerTest.java",
-    "../javatests/src/org/chromium/android_webview/test/services/VisualStateCallbackTest.java",
-    "../javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java",
-    "../javatests/src/org/chromium/android_webview/test/util/AwTestTouchUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/CommonResources.java",
-    "../javatests/src/org/chromium/android_webview/test/util/CookieUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/GraphicsTestUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/ImagePageGenerator.java",
-    "../javatests/src/org/chromium/android_webview/test/util/JSUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/JavascriptEventObserver.java",
-    "../javatests/src/org/chromium/android_webview/test/util/VariationsTestUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/VideoSurfaceViewUtils.java",
-    "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
-    "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
-  ]
-  data = [
-    "data/",
-  ]
-  data_deps = [
-    "//testing/buildbot/filters:webview_instrumentation_test_apk_filters",
-  ]
-
-  # We only want to bother including these on bots set up for VR testing
-  if (include_vr_data) {
-    data += [
-      "//chrome/android/shared_preference_files/test/",
-      "//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
-    ]
-  }
-  additional_apks = [
-    "//android_webview/test/embedded_test_server:aw_net_test_support_apk",
-    "//net/android:net_test_support_apk",
-  ]
-}
-
-test("android_webview_unittests") {
-  # Dependencies (e.g. Play services) make the binary reach the dex limit.
-  enable_multidex = true
-
-  deps = [
-    ":android_webview_unittests_assets",
-    ":android_webview_unittests_java",
-    ":android_webview_unittests_jni",
-    "//android_webview:common",
-    "//base/test:test_support",
-    "//components/prefs:prefs",
-    "//components/prefs:test_support",
-    "//content:content",
-    "//content/test:test_support",
-    "//net:net",
-    "//net:test_support",
-    "//ui/base:ui_base_jni_headers",
-    "//ui/gl",
-    "//ui/gl:test_support",
-  ]
-
-  sources = [
-    "../browser/aw_content_browser_client_unittest.cc",
-    "../browser/aw_contents_client_bridge_unittest.cc",
-    "../browser/aw_form_database_service_unittest.cc",
-    "../browser/aw_media_url_interceptor_unittest.cc",
-    "../browser/aw_permission_manager_unittest.cc",
-    "../browser/aw_safe_browsing_whitelist_manager_unittest.cc",
-    "../browser/aw_static_cookie_policy_unittest.cc",
-    "../browser/browser_view_renderer_unittest.cc",
-    "../browser/command_line_helper_unittest.cc",
-    "../browser/input_stream_unittest.cc",
-    "../browser/net/android_stream_reader_url_request_job_unittest.cc",
-    "../browser/net/aw_cookie_store_wrapper_unittest.cc",
-    "../browser/net/aw_url_request_context_getter_unittest.cc",
-    "../browser/net/input_stream_reader_unittest.cc",
-    "../browser/permission/media_access_permission_request_unittest.cc",
-    "../browser/permission/permission_request_handler_unittest.cc",
-    "../browser/renderer_host/auto_login_parser_unittest.cc",
-    "../browser/state_serializer_unittest.cc",
-    "../browser/test/fake_window.cc",
-    "../browser/test/fake_window.h",
-    "../browser/test/rendering_test.cc",
-    "../browser/test/rendering_test.h",
-    "../lib/webview_tests.cc",
-  ]
-}
-
-android_assets("android_webview_unittests_assets") {
-  sources = [
-    "unittest/assets/asset_file.ogg",
-  ]
-}
-
-android_library("android_webview_unittests_java") {
-  testonly = true
-  deps = [
-    "//android_webview:android_webview_java",
-    "//base:base_java",
-    "//content/public/test/android:content_java_test_support",
-  ]
-  java_files = [
-    "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java",
-    "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
-  ]
-}
-
-generate_jni("android_webview_unittests_jni") {
-  jni_package = "android_webview_unittests"
-  sources = [
-    "../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java",
-    "../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
-  ]
-}
-
-shared_library("libdrawgl") {
-  sources = [
-    "shell/src/draw_gl/draw_gl.cc",
-  ]
-  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-}
--- a/src/android_webview/test/embedded_test_server/BUILD.gn
+++ b/src/android_webview/test/embedded_test_server/BUILD.gn
@ -1,71 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/config.gni")
-import("//build/config/android/rules.gni")
-
-android_library("aw_net_java_test_support") {
-  testonly = true
-  java_files = [
-    "java/src/org/chromium/android_webview/test/AwEmbeddedTestServer.java",
-    "java/src/org/chromium/android_webview/test/AwEmbeddedTestServerImpl.java",
-    "java/src/org/chromium/android_webview/test/AwEmbeddedTestServerService.java",
-  ]
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//net/android:embedded_test_server_aidl_java",
-    "//net/android:net_java",
-    "//net/android:net_java_test_support",
-    "//net/android:net_java_test_support_provider",
-  ]
-}
-
-generate_jni("aw_net_jni_headers") {
-  sources = [
-    "java/src/org/chromium/android_webview/test/AwEmbeddedTestServerImpl.java",
-  ]
-  jni_package = "android_webview/test"
-}
-
-source_set("aw_java_test_native_support") {
-  testonly = true
-  sources = [
-    "../../../net/test/embedded_test_server/android/embedded_test_server_android.cc",
-    "../../../net/test/embedded_test_server/android/embedded_test_server_android.h",
-    "aw_embedded_test_server.cc",
-    "aw_test_entry_point.cc",
-  ]
-  deps = [
-    "//net:test_support",
-  ]
-  public_deps = [
-    ":aw_net_jni_headers",
-    "//net:net_test_jni_headers",
-  ]
-}
-
-shared_library("aw_net_java_test_native_support") {
-  testonly = true
-  deps = [
-    ":aw_java_test_native_support",
-    "//net:test_support",
-  ]
-  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
-  configs += [ "//build/config/android:hide_all_but_jni" ]
-}
-
-android_apk("aw_net_test_support_apk") {
-  testonly = true
-
-  # Used as an additional_apk in test scripts.
-  never_incremental = true
-  deps = [
-    ":aw_net_java_test_support",
-    "//base:base_java",
-  ]
-  android_manifest = "java/AndroidManifest.xml"
-  apk_name = "ChromiumNetTestAwSupport"
-  shared_libraries = [ ":aw_net_java_test_native_support" ]
-}
--- a/src/android_webview/tools/automated_ui_tests/BUILD.gn
+++ b/src/android_webview/tools/automated_ui_tests/BUILD.gn
@ -1,72 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//testing/test.gni")
-
-group("webview_ui_test_app") {
-  testonly = true
-  deps = [
-    ":webview_ui_test_app_apk",
-    ":webview_ui_test_app_test_apk",
-  ]
-}
-
-android_apk("webview_ui_test_app_apk") {
-  apk_name = "WebViewUiTestApp"
-  android_manifest = "java/AndroidManifest.xml"
-  deps = [
-    ":webview_ui_test_app_apk_resources",
-    ":webview_ui_test_app_java",
-  ]
-}
-
-android_library("webview_ui_test_app_java") {
-  java_files =
-      [ "java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java" ]
-  deps = [
-    ":webview_ui_test_app_apk_resources",
-    "//base:base_java",
-  ]
-
-  android_manifest_for_lint = "java/AndroidManifest.xml"
-}
-
-android_resources("webview_ui_test_app_apk_resources") {
-  resource_dirs = [ "java/res" ]
-  custom_package = "org.chromium.webview_ui_test"
-}
-
-instrumentation_test_apk("webview_ui_test_app_test_apk") {
-  apk_name = "WebViewUiTestAppTest"
-  apk_under_test = ":webview_ui_test_app_apk"
-  android_manifest = "javatests/AndroidManifest.xml"
-  java_files = [
-    "javatests/src/org/chromium/webview_ui_test/test/ActionModeTest.java",
-    "javatests/src/org/chromium/webview_ui_test/test/DropDownListTest.java",
-    "javatests/src/org/chromium/webview_ui_test/test/WebViewJSTest.java",
-    "javatests/src/org/chromium/webview_ui_test/test/util/Actions.java",
-    "javatests/src/org/chromium/webview_ui_test/test/util/Atoms.java",
-    "javatests/src/org/chromium/webview_ui_test/test/util/UseLayout.java",
-    "javatests/src/org/chromium/webview_ui_test/test/util/WebViewUiTestRule.java",
-    "javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java",
-  ]
-  deps = [
-    ":webview_ui_test_app_apk_resources",
-    ":webview_ui_test_app_java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//third_party/android_deps:android_support_annotations_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/android_tools:android_test_base_java",
-    "//third_party/espresso:espresso_all_java",
-    "//third_party/hamcrest:hamcrest_java",
-    "//third_party/junit",
-    "//third_party/ub-uiautomator:ub_uiautomator_java",
-  ]
-  data = [
-    "test/data/",
-  ]
-}
--- a/src/android_webview/tools/system_webview_shell/BUILD.gn
+++ b/src/android_webview/tools/system_webview_shell/BUILD.gn
@ -1,90 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//testing/test.gni")
-
-# Mark all targets as test only.
-testonly = true
-
-group("system_webview_shell") {
-  deps = [
-    ":system_webview_shell_apk",
-    ":system_webview_shell_layout_test_apk",
-    ":system_webview_shell_page_cycler_apk",
-  ]
-}
-
-android_apk("system_webview_shell_apk") {
-  apk_name = "SystemWebViewShell"
-  java_files = [
-    "apk/src/org/chromium/webview_shell/JankActivity.java",
-    "apk/src/org/chromium/webview_shell/PageCyclerTestActivity.java",
-    "apk/src/org/chromium/webview_shell/StartupTimeActivity.java",
-    "apk/src/org/chromium/webview_shell/TelemetryActivity.java",
-    "apk/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewCreateDestroyActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewThreadTestActivity.java",
-    "apk/src/org/chromium/webview_shell/WebViewTracingActivity.java",
-  ]
-  android_manifest = "apk/AndroidManifest.xml"
-  deps = [
-    ":system_webview_shell_apk_resources",
-    "//base:base_java",
-  ]
-}
-
-android_resources("system_webview_shell_apk_resources") {
-  resource_dirs = [ "apk/res" ]
-  custom_package = "org.chromium.webview_shell"
-}
-
-instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
-  apk_name = "SystemWebViewShellPageCycler"
-  apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "page_cycler/AndroidManifest.xml"
-  java_files = [ "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java" ]
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//content/public/android:content_java",
-    "//content/public/test/android:content_java_test_support",
-    "//testing/android/reporter:reporter_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-  ]
-  enable_multidex = true
-}
-
-instrumentation_test_apk("system_webview_shell_layout_test_apk") {
-  apk_name = "SystemWebViewShellLayoutTest"
-  apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "layout_tests/AndroidManifest.xml"
-  java_files = [
-    "layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java",
-    "layout_tests/src/org/chromium/webview_shell/test/WebViewThreadTest.java",
-  ]
-  deps = [
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//testing/android/reporter:reporter_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-  ]
-  data = [
-    "test/data/",
-    "//third_party/WebKit/LayoutTests/platform/linux/virtual/stable/webexposed/",
-    "//third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/",
-    "//third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/",
-    "//third_party/WebKit/LayoutTests/resources/global-interface-listing.js",
-    "//third_party/WebKit/LayoutTests/virtual/stable/webexposed/",
-    "//third_party/WebKit/LayoutTests/webexposed/global-interface-listing.html",
-    "//third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt",
-  ]
-  additional_apks = [ system_webview_apk_target ]
-}
--- a/src/android_webview/variables.gni
+++ b/src/android_webview/variables.gni
@ -1,13 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-system_webview_android_manifest =
-    "$root_gen_dir/android_webview/system_webview_apk/AndroidManifest.xml"
-trichrome_webview_android_manifest =
-    "$root_gen_dir/android_webview/trichrome_webview_apk/AndroidManifest.xml"
-
-upstream_only_webview_deps = [
-  "//android_webview:platform_service_bridge_upstream_implementation_java",
-  "//android_webview:system_webview_resources",
-]
--- a/src/android_webview/webview_repack_locales.gni
+++ b/src/android_webview/webview_repack_locales.gni
@ -1,35 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/repack.gni")
-import("webview_repack_locales_list.gni")
-
-# Wraps repack_locales(), setting the source_patterns and deps required for
-# Chrome.
-template("webview_repack_locales") {
-  repack_locales(target_name) {
-    forward_variables_from(invoker, "*")
-    if (!defined(deps)) {
-      deps = []
-    }
-
-    # Adding webview specific pak file? You should add it to
-    # webview_repack_locales_source_patterns, so it is also included in
-    # Monochrome.
-
-    source_patterns = [
-      "${root_gen_dir}/android_webview/components_strings_",
-      "${root_gen_dir}/content/app/strings/content_strings_",
-      "${root_gen_dir}/ui/strings/app_locale_settings_",
-    ]
-    deps += [
-      "//android_webview:generate_components_strings",
-      "//content/app/strings",
-      "//ui/strings:app_locale_settings",
-    ]
-    source_patterns += webview_repack_locales_source_patterns
-    deps += webview_repack_locales_deps
-    output_dir = "$root_out_dir/android_webview/locales"
-  }
-}
--- a/src/android_webview/webview_repack_locales_list.gni
+++ b/src/android_webview/webview_repack_locales_list.gni
@ -1,10 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# For how to add pattern, see additional_source_patterns argument of
-# _repack_one_locale in chrome/chrome_repack_locales.gni.
-webview_repack_locales_source_patterns =
-    [ "${root_gen_dir}/android_webview/aw_strings_" ]
-
-webview_repack_locales_deps = [ "//android_webview:generate_aw_strings" ]
--- a/src/apps/BUILD.gn
+++ b/src/apps/BUILD.gn
@ -1,67 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/features.gni")
-import("//build/config/ui.gni")
-import("//extensions/buildflags/buildflags.gni")
-
-assert(!is_android && !is_ios)
-assert(enable_extensions,
-       "Cannot depend on extensions because enable_extensions=false.")
-
-static_library("apps") {
-  sources = []
-
-  sources += [
-    "app_lifetime_monitor.cc",
-    "app_lifetime_monitor.h",
-    "app_lifetime_monitor_factory.cc",
-    "app_lifetime_monitor_factory.h",
-    "app_restore_service.cc",
-    "app_restore_service.h",
-    "app_restore_service_factory.cc",
-    "app_restore_service_factory.h",
-    "browser_context_keyed_service_factories.cc",
-    "browser_context_keyed_service_factories.h",
-    "launcher.cc",
-    "launcher.h",
-    "saved_files_service.cc",
-    "saved_files_service.h",
-    "saved_files_service_factory.cc",
-    "saved_files_service_factory.h",
-    "switches.cc",
-    "switches.h",
-  ]
-
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
-
-  deps = [
-    "//components/keyed_service/content",
-    "//content/public/browser",
-    "//content/public/common",
-    "//extensions/browser",
-    "//extensions/common",
-    "//extensions/common/api",
-  ]
-
-  if (is_chromeos) {
-    deps += [ "//components/user_manager" ]
-  }
-
-  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-}
-
-static_library("test_support") {
-  testonly = true
-  sources = [
-    "test/app_window_waiter.cc",
-    "test/app_window_waiter.h",
-  ]
-
-  public_deps = [
-    "//content/public/browser",
-    "//extensions/browser",
-  ]
-}
--- a/src/apps/ui/views/BUILD.gn
+++ b/src/apps/ui/views/BUILD.gn
@ -1,26 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-import("//extensions/buildflags/buildflags.gni")
-
-assert(enable_extensions)
-
-source_set("views") {
-  sources = [
-    "app_window_frame_view.cc",
-    "app_window_frame_view.h",
-  ]
-
-  deps = [
-    "//cc/paint",
-    "//chrome/app/theme:theme_resources",
-    "//extensions/browser",
-    "//extensions/common",
-    "//skia",
-    "//ui/gfx",
-    "//ui/strings",
-    "//ui/views",
-  ]
-}
--- a/src/ash/BUILD.gn
+++ b/src/ash/BUILD.gn
--- a/src/ash/app_list/BUILD.gn
+++ b/src/ash/app_list/BUILD.gn
@ -1,237 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-import("//testing/test.gni")
-
-assert(is_chromeos)
-
-component("app_list") {
-  sources = [
-    "app_list_export.h",
-    "app_list_metrics.cc",
-    "app_list_metrics.h",
-    "app_list_util.cc",
-    "app_list_util.h",
-    "app_list_view_delegate.h",
-    "paged_view_structure.cc",
-    "paged_view_structure.h",
-    "pagination_controller.cc",
-    "pagination_controller.h",
-    "pagination_model.cc",
-    "pagination_model.h",
-    "pagination_model_observer.h",
-    "views/app_list_drag_and_drop_host.h",
-    "views/app_list_folder_view.cc",
-    "views/app_list_folder_view.h",
-    "views/app_list_item_view.cc",
-    "views/app_list_item_view.h",
-    "views/app_list_main_view.cc",
-    "views/app_list_main_view.h",
-    "views/app_list_menu_model_adapter.cc",
-    "views/app_list_menu_model_adapter.h",
-    "views/app_list_page.cc",
-    "views/app_list_page.h",
-    "views/app_list_view.cc",
-    "views/app_list_view.h",
-    "views/apps_container_view.cc",
-    "views/apps_container_view.h",
-    "views/apps_grid_view.cc",
-    "views/apps_grid_view.h",
-    "views/apps_grid_view_folder_delegate.h",
-    "views/contents_view.cc",
-    "views/contents_view.h",
-    "views/expand_arrow_view.cc",
-    "views/expand_arrow_view.h",
-    "views/folder_background_view.cc",
-    "views/folder_background_view.h",
-    "views/folder_header_view.cc",
-    "views/folder_header_view.h",
-    "views/folder_header_view_delegate.h",
-    "views/horizontal_page.cc",
-    "views/horizontal_page.h",
-    "views/horizontal_page_container.cc",
-    "views/horizontal_page_container.h",
-    "views/image_shadow_animator.cc",
-    "views/image_shadow_animator.h",
-    "views/indicator_chip_view.cc",
-    "views/indicator_chip_view.h",
-    "views/page_switcher.cc",
-    "views/page_switcher.h",
-    "views/pulsing_block_view.cc",
-    "views/pulsing_block_view.h",
-    "views/search_box_view.cc",
-    "views/search_box_view.h",
-    "views/search_result_actions_view.cc",
-    "views/search_result_actions_view.h",
-    "views/search_result_actions_view_delegate.h",
-    "views/search_result_answer_card_view.cc",
-    "views/search_result_answer_card_view.h",
-    "views/search_result_base_view.cc",
-    "views/search_result_base_view.h",
-    "views/search_result_container_view.cc",
-    "views/search_result_container_view.h",
-    "views/search_result_list_view.cc",
-    "views/search_result_list_view.h",
-    "views/search_result_page_view.cc",
-    "views/search_result_page_view.h",
-    "views/search_result_suggestion_chip_view.cc",
-    "views/search_result_suggestion_chip_view.h",
-    "views/search_result_tile_item_list_view.cc",
-    "views/search_result_tile_item_list_view.h",
-    "views/search_result_tile_item_view.cc",
-    "views/search_result_tile_item_view.h",
-    "views/search_result_view.cc",
-    "views/search_result_view.h",
-    "views/suggestion_chip_container_view.cc",
-    "views/suggestion_chip_container_view.h",
-    "views/suggestion_chip_view.cc",
-    "views/suggestion_chip_view.h",
-    "views/suggestions_container_view.cc",
-    "views/suggestions_container_view.h",
-    "views/top_icon_animation_view.cc",
-    "views/top_icon_animation_view.h",
-  ]
-
-  defines = [ "APP_LIST_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/app_list/resources",
-    "//ash/app_menu",
-    "//ash/assistant/ui:constants",
-    "//ash/public/cpp/app_list/vector_icons",
-    "//ash/public/cpp/vector_icons",
-    "//base",
-    "//base:i18n",
-    "//base/third_party/dynamic_annotations",
-    "//cc/paint",
-    "//chromeos:chromeos",
-    "//components/keyed_service/core",
-    "//components/sync",
-    "//mojo/public/cpp/bindings",
-    "//services/ws/public/cpp",
-    "//services/ws/public/mojom",
-    "//services/ws/remote_view_host",
-    "//skia",
-    "//third_party/icu",
-    "//ui/accessibility",
-    "//ui/aura",
-    "//ui/base",
-    "//ui/base/ime",
-    "//ui/chromeos/search_box",
-    "//ui/compositor",
-    "//ui/display",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/keyboard/",
-    "//ui/resources",
-    "//ui/strings",
-    "//ui/views",
-    "//ui/views/mus/remote_view:remote_view_host",
-    "//ui/wm",
-  ]
-
-  # TODO(hejq): Remove this once app_list is migrated. http://crbug.com/733662
-  public_deps = [
-    "//ash/app_list/model:app_list_model",
-    "//ash/app_list/model:search_model",
-    "//ash/public/cpp:cpp",
-  ]
-}
-
-static_library("test_support") {
-  sources = [
-    "test/app_list_test_model.cc",
-    "test/app_list_test_model.h",
-    "test/app_list_test_view_delegate.cc",
-    "test/app_list_test_view_delegate.h",
-    "test/test_search_result.cc",
-    "test/test_search_result.h",
-    "views/test/apps_grid_view_test_api.cc",
-    "views/test/apps_grid_view_test_api.h",
-  ]
-
-  deps = [
-    ":app_list",
-    "//base",
-    "//ui/base:base",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-}
-
-executable("app_list_demo") {
-  testonly = true
-
-  sources = [
-    "demo/app_list_demo_views.cc",
-  ]
-
-  deps = [
-    ":app_list",
-    ":test_support",
-    "//base",
-    "//build/win:default_exe_manifest",
-    "//content",
-    "//content/public/browser",
-    "//skia",
-    "//ui/base",
-    "//ui/events",
-    "//ui/resources",
-    "//ui/resources:ui_test_pak",
-    "//ui/views",
-    "//ui/views_content_client",
-    "//url",
-  ]
-}
-
-test("app_list_unittests") {
-  sources = [
-    "folder_image_unittest.cc",
-    "pagination_model_unittest.cc",
-    "test/run_all_unittests.cc",
-    "views/app_list_main_view_unittest.cc",
-    "views/app_list_menu_model_adapter_unittest.cc",
-    "views/app_list_view_unittest.cc",
-    "views/apps_grid_view_unittest.cc",
-    "views/folder_header_view_unittest.cc",
-    "views/image_shadow_animator_unittest.cc",
-    "views/search_box_view_unittest.cc",
-    "views/search_result_answer_card_view_unittest.cc",
-    "views/search_result_list_view_unittest.cc",
-    "views/search_result_page_view_unittest.cc",
-    "views/search_result_tile_item_list_view_unittest.cc",
-  ]
-
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
-  deps = [
-    ":app_list",
-    ":test_support",
-    "//ash/public/cpp/app_list/vector_icons",
-    "//base",
-    "//base/test:test_support",
-    "//mojo/core/embedder",
-    "//skia",
-    "//testing/gtest",
-    "//ui/accessibility",
-    "//ui/base",
-    "//ui/chromeos/search_box",
-    "//ui/compositor",
-    "//ui/events:test_support",
-    "//ui/gfx:test_support",
-    "//ui/gl:test_support",
-    "//ui/keyboard",
-    "//ui/resources",
-    "//ui/views",
-    "//ui/views:test_support",
-  ]
-
-  data_deps = [
-    "//third_party/mesa_headers",
-    "//ui/resources:ui_test_pak_data",
-  ]
-}
--- a/src/ash/app_list/model/BUILD.gn
+++ b/src/ash/app_list/model/BUILD.gn
@ -1,57 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-component("app_list_model") {
-  sources = [
-    "app_list_folder_item.cc",
-    "app_list_folder_item.h",
-    "app_list_item.cc",
-    "app_list_item.h",
-    "app_list_item_list.cc",
-    "app_list_item_list.h",
-    "app_list_item_list_observer.h",
-    "app_list_item_observer.h",
-    "app_list_model.cc",
-    "app_list_model.h",
-    "app_list_model_observer.h",
-    "app_list_view_state.h",
-    "folder_image.cc",
-    "folder_image.h",
-  ]
-
-  defines = [ "APP_LIST_MODEL_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/public/cpp:cpp",
-    "//base:i18n",
-    "//cc/paint",
-    "//components/sync",
-    "//skia",
-    "//third_party/icu",
-    "//ui/base",
-    "//ui/gfx",
-  ]
-}
-
-component("search_model") {
-  sources = [
-    "search/search_box_model.cc",
-    "search/search_box_model.h",
-    "search/search_box_model_observer.h",
-    "search/search_model.cc",
-    "search/search_model.h",
-    "search/search_result.cc",
-    "search/search_result.h",
-    "search/search_result_observer.h",
-  ]
-
-  defines = [ "APP_LIST_MODEL_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/public/cpp:cpp",
-    "//base:i18n",
-    "//ui/base",
-    "//ui/gfx",
-  ]
-}
--- a/src/ash/app_list/presenter/BUILD.gn
+++ b/src/ash/app_list/presenter/BUILD.gn
@ -1,35 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-import("//testing/test.gni")
-
-assert(use_aura)
-
-component("presenter") {
-  sources = [
-    "app_list_presenter_delegate.cc",
-    "app_list_presenter_delegate.h",
-    "app_list_presenter_export.h",
-    "app_list_presenter_impl.cc",
-    "app_list_presenter_impl.h",
-  ]
-
-  defines = [ "APP_LIST_PRESENTER_IMPLEMENTATION" ]
-
-  public_deps = [
-    "//ash/app_list",
-    "//base",
-    "//mojo/public/cpp/bindings",
-    "//ui/aura",
-    "//ui/compositor",
-    "//ui/gfx/geometry",
-    "//ui/keyboard",
-    "//ui/views",
-
-    # Temporary dependency to fix compile flake in http://crbug.com/611898.
-    # TODO(tapted): Remove once http://crbug.com/612382 is fixed.
-    "//ui/accessibility:ax_enums_mojo",
-  ]
-}
--- a/src/ash/app_list/resources/BUILD.gn
+++ b/src/ash/app_list/resources/BUILD.gn
@ -1,24 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-import("//tools/grit/repack.gni")
-
-group("resources") {
-  public_deps = [
-    ":resources_grd",
-  ]
-}
-
-grit("resources_grd") {
-  source = "app_list_resources.grd"
-  outputs = [
-    "grit/app_list_resources.h",
-    "grit/app_list_resources_map.cc",
-    "grit/app_list_resources_map.h",
-    "app_list_resources_100_percent.pak",
-    "app_list_resources_200_percent.pak",
-    "app_list_resources_300_percent.pak",
-  ]
-}
--- a/src/ash/app_menu/BUILD.gn
+++ b/src/ash/app_menu/BUILD.gn
@ -1,36 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-
-assert(is_chromeos)
-
-component("app_menu") {
-  sources = [
-    "app_menu_model_adapter.cc",
-    "app_menu_model_adapter.h",
-    "notification_item_view.cc",
-    "notification_item_view.h",
-    "notification_menu_controller.cc",
-    "notification_menu_controller.h",
-    "notification_menu_header_view.cc",
-    "notification_menu_header_view.h",
-    "notification_menu_view.cc",
-    "notification_menu_view.h",
-    "notification_overflow_view.cc",
-    "notification_overflow_view.h",
-  ]
-
-  defines = [ "APP_MENU_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/public/cpp",
-    "//base",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/message_center",
-    "//ui/strings:ui_strings_grit",
-    "//ui/views",
-  ]
-}
--- a/src/ash/assistant/ui/BUILD.gn
+++ b/src/ash/assistant/ui/BUILD.gn
@ -1,20 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-
-assert(is_chromeos)
-
-source_set("constants") {
-  sources = [
-    "assistant_ui_constants.cc",
-    "assistant_ui_constants.h",
-  ]
-
-  deps = [
-    "//base",
-    "//skia",
-    "//ui/gfx",
-  ]
-}
--- a/src/ash/autoclick/common/BUILD.gn
+++ b/src/ash/autoclick/common/BUILD.gn
@ -1,29 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-
-source_set("autoclick") {
-  sources = [
-    "autoclick_controller_common.cc",
-    "autoclick_controller_common.h",
-    "autoclick_controller_common_delegate.h",
-    "autoclick_ring_handler.cc",
-    "autoclick_ring_handler.h",
-  ]
-
-  deps = [
-    "//base",
-    "//cc/paint",
-    "//skia",
-    "//ui/aura",
-    "//ui/compositor",
-    "//ui/display",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/views",
-    "//ui/wm",
-  ]
-}
--- a/src/ash/components/cursor/BUILD.gn
+++ b/src/ash/components/cursor/BUILD.gn
@ -1,23 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("cursor") {
-  sources = [
-    "cursor_view.cc",
-    "cursor_view.h",
-  ]
-
-  deps = [
-    "//ash/components/fast_ink",
-    "//base",
-    "//cc",
-    "//components/viz/common",
-    "//skia",
-    "//ui/aura",
-    "//ui/events",
-    "//ui/events/ozone:events_ozone",
-    "//ui/gfx",
-    "//ui/views:views",
-  ]
-}
--- a/src/ash/components/fast_ink/BUILD.gn
+++ b/src/ash/components/fast_ink/BUILD.gn
@ -1,42 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("fast_ink") {
-  sources = [
-    "fast_ink_pointer_controller.cc",
-    "fast_ink_pointer_controller.h",
-    "fast_ink_points.cc",
-    "fast_ink_points.h",
-    "fast_ink_view.cc",
-    "fast_ink_view.h",
-  ]
-
-  deps = [
-    "//base",
-    "//cc",
-    "//components/viz/service",
-    "//gpu",
-    "//gpu/command_buffer/client:gles2_interface",
-    "//services/ws/public/mojom",
-    "//skia",
-    "//ui/aura",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/gl",
-    "//ui/views:views",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "fast_ink_points_unittest.cc",
-  ]
-
-  deps = [
-    ":fast_ink",
-    "//testing/gtest",
-    "//ui/events:test_support",
-  ]
-}
--- a/src/ash/components/quick_launch/BUILD.gn
+++ b/src/ash/components/quick_launch/BUILD.gn
@ -1,50 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-import("//services/service_manager/public/cpp/service.gni")
-import("//services/service_manager/public/service_manifest.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
-import("//tools/grit/repack.gni")
-
-source_set("lib") {
-  sources = [
-    "quick_launch_application.cc",
-    "quick_launch_application.h",
-  ]
-
-  deps = [
-    "//ash/public/cpp",
-    "//base",
-    "//mash/public/mojom",
-    "//mojo/public/cpp/bindings",
-    "//services/catalog/public/mojom",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
-    "//ui/views",
-    "//ui/views/mus:for_mojo_application",
-    "//url",
-  ]
-}
-
-service("quick_launch_app") {
-  sources = [
-    "main.cc",
-  ]
-
-  deps = [
-    ":lib",
-    "//services/service_manager/public/cpp",
-    "//ui/views/mus:for_mojo_application",
-  ]
-
-  data_deps = [
-    "//ui/views/mus:resources",
-  ]
-}
-
-service_manifest("manifest") {
-  name = "quick_launch_app"
-  source = "manifest.json"
-}
--- a/src/ash/components/quick_launch/public/mojom/BUILD.gn
+++ b/src/ash/components/quick_launch/public/mojom/BUILD.gn
@ -1,17 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-group("mojom") {
-  public_deps = [
-    ":constants",
-  ]
-}
-
-mojom("constants") {
-  sources = [
-    "constants.mojom",
-  ]
-}
--- a/src/ash/components/quick_launch/public/mojom/constants.mojom
+++ b/src/ash/components/quick_launch/public/mojom/constants.mojom
@ -1,7 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module quick_launch.mojom;
-
-const string kServiceName = "quick_launch_app";
--- a/src/ash/components/resources/BUILD.gn
+++ b/src/ash/components/resources/BUILD.gn
@ -1,16 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("resources") {
-  source = "ash_components_resources.grd"
-  outputs = [
-    "grit/ash_components_resources.h",
-    "grit/ash_components_resources_map.cc",
-    "grit/ash_components_resources_map.h",
-    "ash_components_resources_100_percent.pak",
-    "ash_components_resources_200_percent.pak",
-  ]
-}
--- a/src/ash/components/shortcut_viewer/BUILD.gn
+++ b/src/ash/components/shortcut_viewer/BUILD.gn
@ -1,73 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//services/service_manager/public/service_manifest.gni")
-
-# KSV: Keyboard Shortcut Viewer
-source_set("lib") {
-  sources = [
-    "keyboard_shortcut_item.cc",
-    "keyboard_shortcut_item.h",
-    "keyboard_shortcut_viewer_metadata.cc",
-    "keyboard_shortcut_viewer_metadata.h",
-    "ksv_export.h",
-    "last_window_closed_observer.cc",
-    "last_window_closed_observer.h",
-    "shortcut_viewer_application.cc",
-    "shortcut_viewer_application.h",
-    "views/bubble_view.cc",
-    "views/bubble_view.h",
-    "views/keyboard_shortcut_item_list_view.cc",
-    "views/keyboard_shortcut_item_list_view.h",
-    "views/keyboard_shortcut_item_view.cc",
-    "views/keyboard_shortcut_item_view.h",
-    "views/keyboard_shortcut_view.cc",
-    "views/keyboard_shortcut_view.h",
-    "views/ksv_search_box_view.cc",
-    "views/ksv_search_box_view.h",
-  ]
-
-  defines = [ "KSV_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/components/shortcut_viewer/public/mojom",
-    "//ash/components/shortcut_viewer/vector_icons",
-    "//ash/components/strings",
-    "//ash/public/cpp",
-    "//ash/public/cpp/resources:ash_public_unscaled_resources",
-    "//cc/paint",
-    "//services/service_manager/public/cpp/",
-    "//ui/accessibility",
-    "//ui/aura",
-    "//ui/chromeos/events",
-    "//ui/chromeos/search_box",
-    "//ui/events:events_base",
-    "//ui/events/devices",
-    "//ui/events/ozone:events_ozone_layout",
-    "//ui/views",
-    "//ui/views/mus",
-    "//ui/views/mus:resources",
-  ]
-}
-
-service_manifest("manifest") {
-  name = "shortcut_viewer_app"
-  source = "manifest.json"
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "views/keyboard_shortcut_view_unittest.cc",
-  ]
-  deps = [
-    ":lib",
-    "//ash:test_support_without_content",
-    "//base/test:test_support",
-    "//services/ws/public/cpp/input_devices:test_support",
-    "//testing/gtest",
-    "//ui/events:test_support",
-    "//ui/views",
-  ]
-}
--- a/src/ash/components/shortcut_viewer/public/mojom/BUILD.gn
+++ b/src/ash/components/shortcut_viewer/public/mojom/BUILD.gn
@ -1,15 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom("mojom") {
-  sources = [
-    "shortcut_viewer.mojom",
-  ]
-
-  public_deps = [
-    "//mojo/public/mojom/base",
-  ]
-}
--- a/src/ash/components/shortcut_viewer/public/mojom/shortcut_viewer.mojom
+++ b/src/ash/components/shortcut_viewer/public/mojom/shortcut_viewer.mojom
@ -1,17 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module shortcut_viewer.mojom;
-
-import "mojo/public/mojom/base/time.mojom";
-
-const string kServiceName = "shortcut_viewer_app";
-
-// Used to toggle the Keyboard Shortcut Viewer window.
-interface ShortcutViewer {
-  // |user_gesture_time| is the time of the user gesture that caused the window
-  // to show. Used for metrics.
-  Toggle(mojo_base.mojom.TimeTicks user_gesture_time);
-};
-
--- a/src/ash/components/shortcut_viewer/vector_icons/BUILD.gn
+++ b/src/ash/components/shortcut_viewer/vector_icons/BUILD.gn
@ -1,40 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//components/vector_icons/vector_icons.gni")
-
-aggregate_vector_icons("ksv_vector_icons") {
-  icon_directory = "."
-
-  icons = [
-    "ksv_search_back.icon",
-    "ksv_search_bar.icon",
-    "ksv_search_close.icon",
-    "ksv_search_no_result.icon",
-    "ksv_separator_plus.icon",
-    "ksv_arrow_down.icon",
-    "ksv_arrow_left.icon",
-    "ksv_arrow_right.icon",
-    "ksv_arrow_up.icon",
-    "ksv_brightness_down.icon",
-    "ksv_brightness_up.icon",
-    "ksv_browser_back.icon",
-    "ksv_browser_forward.icon",
-    "ksv_fullscreen.icon",
-    "ksv_mute.icon",
-    "ksv_overview.icon",
-    "ksv_reload.icon",
-    "ksv_volume_down.icon",
-    "ksv_volume_up.icon",
-  ]
-}
-
-source_set("vector_icons") {
-  sources = get_target_outputs(":ksv_vector_icons")
-
-  deps = [
-    ":ksv_vector_icons",
-    "//skia",
-  ]
-}
--- a/src/ash/components/strings/BUILD.gn
+++ b/src/ash/components/strings/BUILD.gn
@ -1,66 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("strings") {
-  source = "../ash_components_strings.grd"
-  outputs = [
-    "grit/ash_components_strings.h",
-    "ash_components_strings_am.pak",
-    "ash_components_strings_ar.pak",
-    "ash_components_strings_bg.pak",
-    "ash_components_strings_bn.pak",
-    "ash_components_strings_ca.pak",
-    "ash_components_strings_cs.pak",
-    "ash_components_strings_da.pak",
-    "ash_components_strings_de.pak",
-    "ash_components_strings_el.pak",
-    "ash_components_strings_en-GB.pak",
-    "ash_components_strings_en-US.pak",
-    "ash_components_strings_es-419.pak",
-    "ash_components_strings_es.pak",
-    "ash_components_strings_et.pak",
-    "ash_components_strings_fake-bidi.pak",
-    "ash_components_strings_fa.pak",
-    "ash_components_strings_fil.pak",
-    "ash_components_strings_fi.pak",
-    "ash_components_strings_fr.pak",
-    "ash_components_strings_gu.pak",
-    "ash_components_strings_he.pak",
-    "ash_components_strings_hi.pak",
-    "ash_components_strings_hr.pak",
-    "ash_components_strings_hu.pak",
-    "ash_components_strings_id.pak",
-    "ash_components_strings_it.pak",
-    "ash_components_strings_ja.pak",
-    "ash_components_strings_kn.pak",
-    "ash_components_strings_ko.pak",
-    "ash_components_strings_lt.pak",
-    "ash_components_strings_lv.pak",
-    "ash_components_strings_ml.pak",
-    "ash_components_strings_mr.pak",
-    "ash_components_strings_ms.pak",
-    "ash_components_strings_nb.pak",
-    "ash_components_strings_nl.pak",
-    "ash_components_strings_pl.pak",
-    "ash_components_strings_pt-BR.pak",
-    "ash_components_strings_pt-PT.pak",
-    "ash_components_strings_ro.pak",
-    "ash_components_strings_ru.pak",
-    "ash_components_strings_sk.pak",
-    "ash_components_strings_sl.pak",
-    "ash_components_strings_sr.pak",
-    "ash_components_strings_sv.pak",
-    "ash_components_strings_sw.pak",
-    "ash_components_strings_ta.pak",
-    "ash_components_strings_te.pak",
-    "ash_components_strings_th.pak",
-    "ash_components_strings_tr.pak",
-    "ash_components_strings_uk.pak",
-    "ash_components_strings_vi.pak",
-    "ash_components_strings_zh-CN.pak",
-    "ash_components_strings_zh-TW.pak",
-  ]
-}
--- a/src/ash/components/tap_visualizer/BUILD.gn
+++ b/src/ash/components/tap_visualizer/BUILD.gn
@ -1,51 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//services/service_manager/public/service_manifest.gni")
-
-source_set("lib") {
-  sources = [
-    "tap_renderer.cc",
-    "tap_renderer.h",
-    "tap_visualizer_app.cc",
-    "tap_visualizer_app.h",
-  ]
-
-  deps = [
-    "//ash/public/cpp",
-    "//base",
-    "//cc/paint",
-    "//services/service_manager/public/cpp",
-    "//services/ws/public/cpp",
-    "//services/ws/public/mojom",
-    "//skia",
-    "//ui/compositor",
-    "//ui/events",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/views",
-    "//ui/views/mus:for_mojo_application",
-    "//ui/views/mus:resources",
-  ]
-}
-
-service_manifest("manifest") {
-  name = "tap_visualizer_app"
-  source = "manifest.json"
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "tap_visualizer_app_unittest.cc",
-  ]
-  deps = [
-    ":lib",
-    "//testing/gtest",
-    "//ui/aura:test_support",
-    "//ui/views",
-    "//ui/views:test_support",
-    "//ui/views/mus",
-  ]
-}
--- a/src/ash/components/tap_visualizer/public/mojom/BUILD.gn
+++ b/src/ash/components/tap_visualizer/public/mojom/BUILD.gn
@ -1,17 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-group("mojom") {
-  public_deps = [
-    ":constants",
-  ]
-}
-
-mojom("constants") {
-  sources = [
-    "constants.mojom",
-  ]
-}
--- a/src/ash/components/tap_visualizer/public/mojom/constants.mojom
+++ b/src/ash/components/tap_visualizer/public/mojom/constants.mojom
@ -1,7 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module tap_visualizer.mojom;
-
-const string kServiceName = "tap_visualizer_app";
--- a/src/ash/keyboard/arc/BUILD.gn
+++ b/src/ash/keyboard/arc/BUILD.gn
@ -1,22 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-
-static_library("arc") {
-  sources = [
-    "arc_input_method_surface_manager.cc",
-    "arc_input_method_surface_manager.h",
-    "arc_virtual_keyboard_container_layout_manager.cc",
-    "arc_virtual_keyboard_container_layout_manager.h",
-  ]
-
-  deps = [
-    "//ash/public/cpp",
-    "//base",
-    "//components/exo",
-    "//ui/aura",
-    "//ui/gfx/geometry",
-  ]
-}
--- a/src/ash/login/resources/BUILD.gn
+++ b/src/ash/login/resources/BUILD.gn
@ -1,17 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("resources") {
-  source = "login_resources.grd"
-  outputs = [
-    "grit/login_resources.h",
-    "grit/login_resources_map.cc",
-    "grit/login_resources_map.h",
-    "login_resources_100_percent.pak",
-    "login_resources_200_percent.pak",
-    "login_resources_300_percent.pak",
-  ]
-}
--- a/src/ash/public/cpp/BUILD.gn
+++ b/src/ash/public/cpp/BUILD.gn
@ -1,182 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-# C++ headers and sources that can be used outside ash.
-component("cpp") {
-  sources = [
-    "accelerators.cc",
-    "accelerators.h",
-    "app_list/answer_card_contents_registry.cc",
-    "app_list/answer_card_contents_registry.h",
-    "app_list/app_list_config.cc",
-    "app_list/app_list_config.h",
-    "app_list/app_list_constants.cc",
-    "app_list/app_list_constants.h",
-    "app_list/app_list_features.cc",
-    "app_list/app_list_features.h",
-    "app_list/app_list_switches.cc",
-    "app_list/app_list_switches.h",
-    "app_list/app_list_types.cc",
-    "app_list/app_list_types.h",
-    "app_list/internal_app_id_constants.h",
-    "app_list/term_break_iterator.cc",
-    "app_list/term_break_iterator.h",
-    "app_list/tokenized_string.cc",
-    "app_list/tokenized_string.h",
-    "app_list/tokenized_string_char_iterator.cc",
-    "app_list/tokenized_string_char_iterator.h",
-    "app_list/tokenized_string_match.cc",
-    "app_list/tokenized_string_match.h",
-    "app_menu_constants.h",
-    "app_types.h",
-    "ash_client.cc",
-    "ash_client.h",
-    "ash_constants.h",
-    "ash_features.cc",
-    "ash_features.h",
-    "ash_layout_constants.cc",
-    "ash_layout_constants.h",
-    "ash_pref_names.cc",
-    "ash_pref_names.h",
-    "ash_public_export.h",
-    "ash_switches.cc",
-    "ash_switches.h",
-    "ash_typography.cc",
-    "ash_typography.h",
-    "ash_view_ids.h",
-    "caption_buttons/caption_button_model.h",
-    "caption_buttons/caption_button_types.h",
-    "caption_buttons/frame_back_button.cc",
-    "caption_buttons/frame_back_button.h",
-    "caption_buttons/frame_caption_button.cc",
-    "caption_buttons/frame_caption_button.h",
-    "caption_buttons/frame_caption_button_container_view.cc",
-    "caption_buttons/frame_caption_button_container_view.h",
-    "caption_buttons/frame_caption_delegate.h",
-    "caption_buttons/frame_size_button.cc",
-    "caption_buttons/frame_size_button.h",
-    "caption_buttons/frame_size_button_delegate.h",
-    "default_frame_header.cc",
-    "default_frame_header.h",
-    "default_scale_factor_retriever.cc",
-    "default_scale_factor_retriever.h",
-    "frame_header.cc",
-    "frame_header.h",
-    "frame_utils.cc",
-    "frame_utils.h",
-    "gesture_action_type.h",
-    "immersive/immersive_context.h",
-    "immersive/immersive_focus_watcher.h",
-    "immersive/immersive_fullscreen_controller.cc",
-    "immersive/immersive_fullscreen_controller.h",
-    "immersive/immersive_fullscreen_controller_delegate.h",
-    "immersive/immersive_gesture_handler.h",
-    "immersive/immersive_handler_factory.cc",
-    "immersive/immersive_handler_factory.h",
-    "immersive/immersive_revealed_lock.cc",
-    "immersive/immersive_revealed_lock.h",
-    "login_constants.h",
-    "menu_utils.cc",
-    "menu_utils.h",
-    "mus_property_mirror_ash.cc",
-    "mus_property_mirror_ash.h",
-    "network_icon_image_source.cc",
-    "network_icon_image_source.h",
-    "power_utils.cc",
-    "power_utils.h",
-    "remote_shelf_item_delegate.cc",
-    "remote_shelf_item_delegate.h",
-    "scale_utility.cc",
-    "scale_utility.h",
-    "session_types.h",
-    "shelf_item.cc",
-    "shelf_item.h",
-    "shelf_item_delegate.cc",
-    "shelf_item_delegate.h",
-    "shelf_model.cc",
-    "shelf_model.h",
-    "shelf_model_observer.h",
-    "shelf_prefs.cc",
-    "shelf_prefs.h",
-    "shelf_types.cc",
-    "shelf_types.h",
-    "shell_window_ids.cc",
-    "shell_window_ids.h",
-    "stylus_utils.cc",
-    "stylus_utils.h",
-    "tablet_mode.cc",
-    "tablet_mode.h",
-    "wallpaper_types.h",
-    "window_animation_types.h",
-    "window_pin_type.cc",
-    "window_pin_type.h",
-    "window_properties.cc",
-    "window_properties.h",
-    "window_state_type.cc",
-    "window_state_type.h",
-  ]
-
-  defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
-
-  deps = [
-    "//ash/public/cpp/vector_icons",
-    "//chromeos:power_manager_proto",
-    "//components/prefs",
-    "//services/ws/public/mojom",
-    "//skia/public/interfaces",
-    "//ui/aura",
-    "//ui/chromeos/strings",
-    "//ui/display",
-    "//ui/events/devices",
-    "//ui/views",
-    "//ui/views/mus",
-    "//ui/wm",
-  ]
-
-  public_deps = [
-    "//ash/public/interfaces:interfaces_internal",
-    "//base",
-    "//ui/gfx",
-  ]
-
-  allow_circular_includes_from =
-      [ "//ash/public/interfaces:interfaces_internal" ]
-
-  output_name = "ash_public_cpp"
-}
-
-# Using a test service because the traits need to pass handles around. Revisit
-# this after Deserialize(Serialize()) API works with handles.
-mojom("test_interfaces") {
-  visibility = [ ":unit_tests" ]
-
-  sources = [
-    "shelf_struct_traits_test_service.mojom",
-  ]
-
-  public_deps = [
-    "//ash/public/interfaces:interfaces_internal",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "default_scale_factor_retriever_unittest.cc",
-    "menu_utils_unittest.cc",
-    "power_utils_unittest.cc",
-    "shelf_model_unittest.cc",
-    "shelf_struct_mojom_traits_unittest.cc",
-  ]
-
-  deps = [
-    ":cpp",
-    ":test_interfaces",
-    "//base",
-    "//testing/gtest",
-    "//ui/gfx:test_support",
-  ]
-}
--- a/src/ash/public/cpp/app_list/vector_icons/BUILD.gn
+++ b/src/ash/public/cpp/app_list/vector_icons/BUILD.gn
@ -1,34 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//components/vector_icons/vector_icons.gni")
-
-aggregate_vector_icons("app_list_vector_icons") {
-  icon_directory = "."
-
-  icons = [
-    "ic_arrow_up.icon",
-    "ic_badge_instant.icon",
-    "ic_badge_play.icon",
-    "ic_badge_rating.icon",
-    "ic_bookmark.icon",
-    "ic_domain.icon",
-    "ic_equal.icon",
-    "ic_google_black.icon",
-    "ic_google_color.icon",
-    "ic_history.icon",
-    "ic_mic_black.icon",
-    "ic_search.icon",
-    "ic_search_engine_not_google.icon",
-  ]
-}
-
-source_set("vector_icons") {
-  sources = get_target_outputs(":app_list_vector_icons")
-
-  deps = [
-    ":app_list_vector_icons",
-    "//skia",
-  ]
-}
--- a/src/ash/public/cpp/resources/BUILD.gn
+++ b/src/ash/public/cpp/resources/BUILD.gn
@ -1,13 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-
-grit("ash_public_unscaled_resources") {
-  source = "ash_public_unscaled_resources.grd"
-  outputs = [
-    "grit/ash_public_unscaled_resources.h",
-    "ash_public_unscaled_resources.pak",
-  ]
-}
--- a/src/ash/public/cpp/shelf_struct_traits_test_service.mojom
+++ b/src/ash/public/cpp/shelf_struct_traits_test_service.mojom
@ -1,13 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "ash/public/interfaces/shelf.mojom";
-
-// A test echo interface for traits.
-interface ShelfStructTraitsTestService {
-  [Sync]
-  EchoShelfItem(ShelfItem in) => (ShelfItem out);
-};
--- a/src/ash/public/cpp/vector_icons/BUILD.gn
+++ b/src/ash/public/cpp/vector_icons/BUILD.gn
@ -1,58 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//components/vector_icons/vector_icons.gni")
-
-# The icons in this target, unlike those in //ash/resources/vector_icons, are ok to use from outside of ash/.
-aggregate_vector_icons("ash_public_vector_icons") {
-  icon_directory = "."
-
-  icons = [
-    "assistant.icon",
-    "notification_assistant.icon",
-    "notification_captive_portal.icon",
-    "notification_cellular_alert.icon",
-    "notification_download.icon",
-    "notification_end_of_support.icon",
-    "window_control_dezoom.icon",
-    "window_control_back.icon",
-    "window_control_menu.icon",
-    "window_control_zoom.icon",
-    "notification_family_link.icon",
-    "notification_google.icon",
-    "notification_image.icon",
-    "notification_installed.icon",
-    "notification_linux.icon",
-    "notification_mobile_data.icon",
-    "notification_mobile_data_off.icon",
-    "notification_multi_device_setup.icon",
-    "notification_play_prism.icon",
-    "notification_printing.icon",
-    "notification_printing_done.icon",
-    "notification_printing_warning.icon",
-    "notification_settings.icon",
-    "notification_storage_full.icon",
-    "notification_supervised_user.icon",
-    "notification_vpn.icon",
-    "notification_warning.icon",
-    "notification_wifi_off.icon",
-    "window_control_close.icon",
-    "window_control_left_snapped.icon",
-    "window_control_maximize.icon",
-    "window_control_minimize.icon",
-    "window_control_restore.icon",
-    "window_control_right_snapped.icon",
-  ]
-}
-
-source_set("vector_icons") {
-  sources = get_target_outputs(":ash_public_vector_icons")
-
-  deps = [
-    ":ash_public_vector_icons",
-    "//base",
-    "//skia",
-    "//ui/gfx",
-  ]
-}
--- a/src/ash/public/interfaces/BUILD.gn
+++ b/src/ash/public/interfaces/BUILD.gn
@ -1,109 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-
-# Depend upon //ash/public/cpp, which has a public_dep on this. The two targets
-# must be bundled together as the typemaps depend upon //ash/public/cpp,
-# and //ash/public/cpp needs to depend on this for generated code (such as
-# enums and constants).
-mojom("interfaces_internal") {
-  visibility = [ "//ash/public/cpp:*" ]
-
-  sources = [
-    "accelerator_controller.mojom",
-    "accessibility_controller.mojom",
-    "accessibility_focus_ring_controller.mojom",
-    "app_list.mojom",
-    "ash_display_controller.mojom",
-    "ash_message_center_controller.mojom",
-    "ash_window_manager.mojom",
-    "assistant_controller.mojom",
-    "assistant_image_downloader.mojom",
-    "assistant_setup.mojom",
-    "assistant_volume_control.mojom",
-    "cast_config.mojom",
-    "constants.mojom",
-    "cros_display_config.mojom",
-    "display_output_protection.mojom",
-    "docked_magnifier_controller.mojom",
-    "event_properties.mojom",
-    "event_rewriter_controller.mojom",
-    "first_run_helper.mojom",
-    "highlighter_controller.mojom",
-    "ime_controller.mojom",
-    "ime_info.mojom",
-    "keyboard_controller.mojom",
-    "kiosk_app_info.mojom",
-    "locale.mojom",
-    "login_screen.mojom",
-    "login_user_info.mojom",
-    "media.mojom",
-    "menu.mojom",
-    "new_window.mojom",
-    "night_light_controller.mojom",
-    "note_taking_controller.mojom",
-    "pref_connector.mojom",
-    "process_creation_time_recorder.mojom",
-    "session_controller.mojom",
-    "shelf.mojom",
-    "shutdown.mojom",
-    "split_view.mojom",
-    "system_tray.mojom",
-    "tablet_mode.mojom",
-    "tray_action.mojom",
-    "update.mojom",
-    "user_info.mojom",
-    "voice_interaction_controller.mojom",
-    "volume.mojom",
-    "vpn_list.mojom",
-    "wallpaper.mojom",
-    "web_contents_manager.mojom",
-    "window_pin_type.mojom",
-    "window_properties.mojom",
-    "window_state_type.mojom",
-  ]
-
-  public_deps = [
-    "//chromeos/components/proximity_auth/public/interfaces",
-    "//chromeos/services/assistant/public/mojom",
-    "//components/account_id/interfaces",
-    "//components/arc/common:notifications",
-    "//components/sync/mojo:interfaces",
-    "//mojo/public/mojom/base",
-    "//services/preferences/public/mojom",
-    "//skia/public/interfaces",
-    "//ui/accessibility:ax_enums_mojo",
-    "//ui/base/ime/chromeos/public/interfaces",
-    "//ui/base/mojo",
-    "//ui/display/mojo:interfaces",
-    "//ui/events/mojo:interfaces",
-    "//ui/gfx/geometry/mojo",
-    "//ui/gfx/image/mojo:interfaces",
-    "//ui/gfx/range/mojo",
-    "//ui/keyboard:mojom",
-    "//ui/message_center/public/mojo:mojo",
-    "//url/mojom:url_mojom_gurl",
-  ]
-
-  component_output_prefix = "ash_public_interfaces_internal"
-  export_class_attribute = "ASH_PUBLIC_EXPORT"
-  export_define = "ASH_PUBLIC_IMPLEMENTATION=1"
-  export_header = "ash/public/cpp/ash_public_export.h"
-}
-
-mojom("test_interfaces") {
-  testonly = true
-  sources = [
-    "shelf_test_api.mojom",
-    "shell_test_api.mojom",
-    "status_area_widget_test_api.mojom",
-    "system_tray_test_api.mojom",
-    "time_to_first_present_recorder_test_api.mojom",
-  ]
-  deps = [
-    "//mojo/public/mojom/base",
-    "//ui/gfx/geometry/mojo",
-  ]
-}
--- a/src/ash/public/interfaces/accelerator_controller.mojom
+++ b/src/ash/public/interfaces/accelerator_controller.mojom
@ -1,16 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "ash/public/interfaces/volume.mojom";
-
-// Implemented by ash to delegate parts of keyboard accelerator handling back
-// to chrome.
-interface AcceleratorController {
-  // Sets the volume controller interface. This lives in chrome because chrome
-  // owns the D-Bus CrasAudioHandler implementation. Also the accessibility
-  // manager in chrome needs to know about volume changes.
-  SetVolumeController(VolumeController controller);
-};
--- a/src/ash/public/interfaces/accessibility_controller.mojom
+++ b/src/ash/public/interfaces/accessibility_controller.mojom
@ -1,183 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "mojo/public/mojom/base/time.mojom";
-import "ui/accessibility/ax_enums.mojom";
-import "ui/events/mojo/event.mojom";
-import "ui/gfx/geometry/mojo/geometry.mojom";
-
-// Alert sent to the accessibility api.
-enum AccessibilityAlert {
-  // Default value, indicates no accessibility alert.
-  NONE,
-
-  // When caps lock is turned on.
-  CAPS_ON,
-
-  // When caps lock is turned off.
-  CAPS_OFF,
-
-  // When screen is turned on by tablet power button.
-  SCREEN_ON,
-
-  // When screen is turned off by tablet power button.
-  SCREEN_OFF,
-
-  // When window moved to another display by accelerators.
-  WINDOW_MOVED_TO_ANOTHER_DISPLAY,
-
-  // When the user attempts a keyboard command that requires a window to work,
-  // and none is available.
-  WINDOW_NEEDED,
-
-  // When the user enters window overview mode.
-  WINDOW_OVERVIEW_MODE_ENTERED
-};
-
-enum AccessibilityPanelState {
-  // Window bounds are set explicitly.
-  BOUNDED,
-
-  // Width of panel matches screen width, y_coord and height are set by bounds.
-  FULL_WIDTH,
-
-  // Panel occupies the full screen. Bounds are ignored.
-  FULLSCREEN
-};
-
-// These values are persisted to logs and should not be renumbered or re-used.
-// See tools/metrics/histograms/enums.xml.
-enum DictationToggleSource {
-  // Toggled by the keyboard command (Search + D).
-  kKeyboard,
-
-  // Toggled by the dictation button in the tray.
-  kButton,
-
-  // Switch Access context menu button.
-  kSwitchAccess,
-
-  // Chromevox chrome extension.
-  kChromevox
-};
-
-enum SelectToSpeakState {
-  // Select to Speak is not actively selecting text or speaking.
-  kSelectToSpeakStateInactive,
-
-  // Select to Speak is being used to actively select a new region. Note that
-  // it might also be speaking, but the selecting state takes precedence.
-  kSelectToSpeakStateSelecting,
-
-  // Select to Speak is currently speaking.
-  kSelectToSpeakStateSpeaking,
-};
-
-// Allows a client to implement Select-to-Speak.
-// TODO(katie): Consider combining DispatchMouseEvent and DispatchKeyEvent
-// into a single DispatchEvent function.
-interface SelectToSpeakEventHandlerDelegate {
-  // Sends a KeyEvent to the Select-to-Speak extension in Chrome. The event
-  // is cast to a key event with a type CHECK.
-  DispatchKeyEvent(ui.mojom.Event event);
-
-  // Sends a MouseEvent to the Select-to-Speak extension in Chrome. The event
-  // is cast to a mouse event with a type CHECK.
-  DispatchMouseEvent(ui.mojom.Event event);
-};
-
-// Interface for ash client (e.g. Chrome) to control and query accessibility
-// features.
-interface AccessibilityController {
-  // Sets the client interface.
-  SetClient(AccessibilityControllerClient client);
-
-  // Starts or stops darkening the screen (e.g. to allow chrome a11y extensions
-  // to darken the screen).
-  SetDarkenScreen(bool darken);
-
-  // Called when braille display state is changed.
-  BrailleDisplayStateChanged(bool connected);
-
-  // Sets the focus highlight rect using |bounds_in_screen|. Called when focus
-  // changed in page and a11y focus highlight feature is enabled.
-  SetFocusHighlightRect(gfx.mojom.Rect bounds_in_screen);
-
-  // Sets the text input caret bounds used to draw the caret highlight effect.
-  // For effciency, only sent when the caret highlight feature is enabled.
-  // Setting off-screen or empty bounds suppresses the highlight.
-  SetCaretBounds(gfx.mojom.Rect bounds_in_screen);
-
-  // Sets whether the accessibility panel should always be visible, regardless
-  // of whether the window is fullscreen.
-  SetAccessibilityPanelAlwaysVisible(bool always_visible);
-
-  // Sets the bounds for the accessibility panel. Overrides current
-  // configuration (i.e. fullscreen, full-width).
-  SetAccessibilityPanelBounds(gfx.mojom.Rect bounds,
-                              AccessibilityPanelState state);
-
-  // Sets the current Select-to-Speak state. This should be used by the Select-
-  // to-Speak extension to inform ash of its updated state.
-  SetSelectToSpeakState(SelectToSpeakState state);
-
-  // Set the delegate used by the Select-to-Speak event handler.
-  SetSelectToSpeakEventHandlerDelegate(
-      SelectToSpeakEventHandlerDelegate delegate);
-
-  // Starts or stops dictation. Records metrics for toggling via SwitchAccess.
-  ToggleDictationFromSource(DictationToggleSource source);
-};
-
-// Interface for ash to request accessibility service from its client (e.g.
-// Chrome).
-interface AccessibilityControllerClient {
-  // Triggers an accessibility alert to give the user feedback.
-  TriggerAccessibilityAlert(AccessibilityAlert alert);
-
-  // Plays an earcon. Earcons are brief and distinctive sounds that indicate
-  // that their mapped event has occurred. The |sound_key| enums can be found in
-  // chromeos/audio/chromeos_sounds.h. This method exists because the browser
-  // owns all media playback.
-  PlayEarcon(int32 sound_key);
-
-  // Initiates play of shutdown sound and returns sound duration. This method
-  // exists because the browser owns all media playback.
-  PlayShutdownSound() => (mojo_base.mojom.TimeDelta sound_duration);
-
-  // Forwards an accessibility gesture from the touch exploration controller to
-  // ChromeVox.
-  HandleAccessibilityGesture(ax.mojom.Gesture gesture);
-
-  // Starts or stops dictation (type what you speak).
-  // Returns the new dictation state after the toggle.
-  ToggleDictation() => (bool dictation_on);
-
-  // Cancels all current and queued speech immediately.
-  SilenceSpokenFeedback();
-
-  // Called when we first detect two fingers are held down, which can be used to
-  // toggle spoken feedback on some touch-only devices.
-  OnTwoFingerTouchStart();
-
-  // Called when the user is no longer holding down two fingers (including
-  // releasing one, holding down three, or moving them).
-  OnTwoFingerTouchStop();
-
-  // Whether or not to enable toggling spoken feedback via holding down two
-  // fingers on the screen.
-  ShouldToggleSpokenFeedbackViaTouch() => (bool should_toggle);
-
-  // Plays tick sound indicating spoken feedback will be toggled after
-  // countdown.
-  PlaySpokenFeedbackToggleCountdown(int32 tick_count);
-
-  // Requests the Select-to-Speak extension to change its state. This lets users
-  // do the same things in tablet mode as with a keyboard. Specifically, if
-  // Select-to-Speak is not speaking, move to capturing state; if
-  // Select-to-Speak is speaking, cancel speaking and move to inactive state.
-  RequestSelectToSpeakStateChange();
-};
--- a/src/ash/public/interfaces/accessibility_focus_ring_controller.mojom
+++ b/src/ash/public/interfaces/accessibility_focus_ring_controller.mojom
@ -1,41 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "ui/gfx/geometry/mojo/geometry.mojom";
-
-enum FocusRingBehavior { FADE_OUT_FOCUS_RING, PERSIST_FOCUS_RING };
-
-// Interface for ash client (e.g. Chrome) to control and query accessibility
-// focus ring features.
-interface AccessibilityFocusRingController {
-  // Sets the focus ring color for the given caller.
-  SetFocusRingColor(uint32 skcolor, string caller_id);
-
-  // Resets the focus ring color back to the default for the given caller.
-  ResetFocusRingColor(string caller_id);
-
-  // Draws a focus ring around the given set of rects in screen coordinates. Use
-  // |focus_ring_behavior| to specify whether the focus ring should persist or
-  // fade out for the given caller.
-  SetFocusRing(array<gfx.mojom.Rect> rects_in_screen,
-               FocusRingBehavior focus_ring_behavior,
-               string caller_id);
-
-  // Hides focus ring on screen for the given caller.
-  HideFocusRing(string caller_id);
-
-  // Draws a highlight at the given rects in screen coordinates. Rects may be
-  // overlapping and will be merged into one layer. This looks similar to
-  // selecting a region with the cursor, except it is drawn in the foreground
-  // rather than behind a text layer.
-  // TODO(katie): Add |caller_id| to highlights as well if other Accessibility
-  // tools or extensions want to use this API.
-  SetHighlights(array<gfx.mojom.Rect> rects_in_screen, uint32 skcolor);
-
-  // Hides highlight on screen.
-  // TODO(katie): Add |caller_id| to highlights as well.
-  HideHighlights();
-};
--- a/src/ash/public/interfaces/app_list.mojom
+++ b/src/ash/public/interfaces/app_list.mojom
@ -1,374 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "ash/public/interfaces/menu.mojom";
-import "components/sync/mojo/syncer.mojom";
-import "mojo/public/mojom/base/string16.mojom";
-import "mojo/public/mojom/base/unguessable_token.mojom";
-import "ui/gfx/geometry/mojo/geometry.mojom";
-import "ui/gfx/image/mojo/image.mojom";
-import "ui/gfx/range/mojo/range.mojom";
-
-// A structure holding the common information which is sent between ash and,
-// chrome representing an app list item.
-// This structure should be kept as small as possible so that minimum data
-// is sent via mojo calls when an item is moved or reparented.
-struct AppListItemMetadata {
-  string id;          // The id of the app list item.
-  string name;        // The corresponding app or folder's name of the item.
-  string short_name;  // The corresponding app's short name of the item. It's
-                      // empty if the app doesn't have one or it's a folder.
-  string folder_id;   // The id of the item's folder.
-  syncer.mojom.StringOrdinal position; // The position of the item.
-  bool is_folder;     // Whether this item is a folder.
-  gfx.mojom.ImageSkia? icon;  // The icon of this item.
-  bool is_page_break; // Whether this item is a "page break" item.
-};
-
-// A structure holding the common information which is sent from chrome to ash,
-// representing a search result.
-// This structure should be kept as small as possible so that ash can get and
-// render search results as early as possible.
-struct SearchResultMetadata {
-  string id;                  // The id of the result.
-  mojo_base.mojom.String16 title;    // The title of the result, e.g. an app's
-                                     // name, an autocomplete query, etc.
-  mojo_base.mojom.String16 details;  // A detail string of this result.
-  array<SearchResultTag> title_tags;    // How the title matches the query. See
-                                        // the SearchResultTag section for
-                                        // more details.
-  array<SearchResultTag> details_tags;  // How the details match the query. See
-                                        // the SearchResultTag section for
-                                        // more details.
-  array<SearchResultAction> actions;    // Actions that can be performed on this
-                                        // result. See the SearchResultAction
-                                        // section for more details.
-  float rating = -1.0;        // The average rating score of the app
-                              // corresponding to this result, ranged from 0 to
-                              // 5. It's negative if there's no rating for the
-                              // result.
-  mojo_base.mojom.String16 formatted_price;  // A formatted price string, e.g.
-                                             // "$7.09", "HK$3.94", etc.
-  SearchResultType result_type;              // The type of this result.
-  SearchResultDisplayType display_type = kList;
-                                             // How this result is displayed.
-  double display_score;       // A score to determine the result display order.
-  bool is_omnibox_search;     // Whether this result is searched from Omnibox.
-  bool is_installing;         // Whether this result is installing.
-  mojo_base.mojom.UnguessableToken? answer_card_contents_token;
-                              // A token used to render answer card, which is
-                              // empty before initialized. It's illegal to pass
-                              // an empty UnguessableToken across processes. So
-                              // we use a null value when it's empty here.
-  gfx.mojom.Size? answer_card_size;  // Preferred size of answer card. It is
-                                     // unset for non-answer-card results. For
-                                     // answer card results, it is set when
-                                     // the answer card WebContents finishes
-                                     // loading and its renderer notifies it
-                                     // about a new contents size.
-  gfx.mojom.ImageSkia? icon;  // The icon of this result.
-  gfx.mojom.ImageSkia? chip_icon;  // The icon of this result in a smaller
-                                   // dimension to be rendered in suggestion
-                                   // chip view.
-  gfx.mojom.ImageSkia? badge_icon;  // The badge icon of this result that
-                                    // indicates its type, e.g. installable from
-                                    // PlayStore, installable from WebStore,
-                                    // etc.
-};
-
-// All possible states of the app list.
-enum AppListState {
-  kStateApps = 0,
-  kStateSearchResults,
-  kStateStart,
-};
-
-// The status of the app list model.
-enum AppListModelStatus {
-  kStatusNormal,
-  kStatusSyncing,  // Syncing apps or installing synced apps.
-};
-
-// How the result should be displayed. Do not change the order of these as
-// they are used for metrics.
-enum SearchResultDisplayType {
-  kNone = 0,
-  kList,
-  kTile,
-  kRecommendation,
-  kCard,
-  // Add new values here.
-};
-
-// Type of the search result, which is set in Chrome.
-enum SearchResultType {
-  kInstalledApp,    // Installed apps.
-  kPlayStoreApp,    // Installable apps from PlayStore.
-  kInstantApp,      // Instant apps.
-  kInternalApp,     // Chrome OS apps.
-  kWebStoreApp,     // Installable apps from WebStore.
-  kWebStoreSearch,  // A search query in WebStore.
-  kOmnibox,         // Results from Omninbox.
-  kLauncher,        // Results from launcher search (currently only from Files).
-  kAnswerCard,      // WebContents based answer card.
-  // Add new values here.
-};
-
-// A tagged range in search result text.
-struct SearchResultTag {
-  // Similar to ACMatchClassification::Style, the style values are not
-  // mutually exclusive.
-  int16 styles;
-  gfx.mojom.Range range;
-};
-
-// Data representing an action that can be performed on a search result.
-// An action could be represented as an icon set or as a blue button with
-// a label. Icon set is chosen if label text is empty. Otherwise, a blue
-// button with the label text will be used.
-struct SearchResultActionImageLabel {
-  gfx.mojom.ImageSkia base_image;
-  gfx.mojom.ImageSkia hover_image;
-  gfx.mojom.ImageSkia pressed_image;
-};
-union SearchResultActionLabel {
-  SearchResultActionImageLabel image_label;
-  mojo_base.mojom.String16 text_label;
-};
-struct SearchResultAction {
-  mojo_base.mojom.String16 tooltip_text;
-  SearchResultActionLabel label;
-};
-
-// The Chrome app list (aka Launcher), is the place where user can find and
-// organize all installed apps, or search for various types of information.
-//
-// For apps:
-// The app list displays apps synced across devices based on a user account, in
-// an order that can be modified by the user. It supports up-to-3-layer app
-// organization, the root app list, folders, and apps:
-// - Each app can stay in the root app list or a folder.
-// - Each folder holds more than one apps, which means it'll automatically get
-//   removed when there's only one app left in it.
-// - The OEM folder is a special folder where we cannot move items to/from it.
-//   And we cannot rename it.
-// - Other folders are renamable.
-// - Folders cannot hold folders.
-// - Different items/folders never have a same GUID.
-// - Every item/folder has a same GUID on different devices.
-//
-// For searching:
-// The app list supports various kinds of searching (e.g. apps, onmibox, etc).
-// And search results can be displayed in different formats (e.g. tiles, cards).
-// - Result ids are url like string, e.g.
-//   "chrome-extension://mgndgikekgjfcpckkfioiadnlibdjbkf/",
-//   "play://hhbckbkcbnemggclionhhgaceohjfdkl", etc.
-// - Different search results never have a same id.
-// - Every search result has a same id on different devices.
-// - Every search result can have a list of actions (e.g. install), see
-//   app_list::SearchResult::Action.
-//
-// Users can long press on any app list item or search result to show a context
-// menu. A context menu has a list of commands (e.g. open, uninstall, etc.).
-// - Different items/results may have different command lists.
-// - Each item/result usually has a same command list, but not always. Consider
-//   when we pin an app to the shelf and when we unpin it, the context menu
-//   looks different.
-// - Inside each command list, each command has its own unique command id.
-// - A same command in different command lists has a unique command id, see
-//   app_list::AppContextMenu::CommandId.
-
-// The Chrome app list has its UI running in Ash, and everything else running in
-// Chrome (e.g. syncing, user profile, etc). This controller is implemented in
-// Ash to handle calls from Chrome. These include:
-// - When app list data changes in Chrome, it should notifies the UI models and
-//   views in Ash to get updated. This can happen while syncing, searching, etc.
-// - When Chrome needs real-time UI information from Ash. This can happen while
-//   calculating recommended search results based on the app list item order.
-// - When app list states in Chrome change that require UI's response. This can
-//   happen while installing/uninstalling apps and the app list gets toggled.
-interface AppListController {
-  // Sets a client to handle calls from Ash.
-  SetClient(AppListClient client);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces that come from AppListModelUpdater:
-  // The following interfaces are called to update the app list model in Ash,
-  // including both the app list item model, search result model and search box
-  // model.
-  // Adds an item to AppListModel.
-  AddItem(AppListItemMetadata app_item);
-  // Adds an item into a certain folder in AppListModel.
-  AddItemToFolder(AppListItemMetadata app_item, string folder_id);
-  // Removes an item by its id from AppListModel.
-  RemoveItem(string id);
-  // Removes an item by its id, and also cleans up if its parent folder has a
-  // single child left.
-  RemoveUninstalledItem(string id);
-  // Moves the item with |id| to the folder with |folder_id|.
-  MoveItemToFolder(string id, string folder_id);
-  // Tells Ash what the current status of AppListModel should be,
-  // e.g. the model is under synchronization or in normal status.
-  SetStatus(AppListModelStatus status);
-  // Tells Ash what the current state of the app list should be,
-  // e.g. the user is searching for something, or showing apps, etc.
-  SetState(AppListState state);
-  // Highlights the given item in the app list. If not present and it is later
-  // added, the item will be highlighted after being added.
-  HighlightItemInstalledFromUI(string id);
-  // Sets whether the search engine is Google or not.
-  SetSearchEngineIsGoogle(bool is_google);
-  // Sets the text for screen readers on the search box, and updates the
-  // accessible names.
-  SetSearchTabletAndClamshellAccessibleName(
-      mojo_base.mojom.String16 tablet_accessible_name,
-      mojo_base.mojom.String16 clamshell_accessible_name);
-  // Sets the hint text to display when there is in input.
-  SetSearchHintText(mojo_base.mojom.String16 hint_text);
-  // Sets the text for the search box's Textfield and the voice search flag.
-  UpdateSearchBox(mojo_base.mojom.String16 text, bool initiated_by_user);
-  // Publishes search results to Ash to render them.
-  PublishSearchResults(array<SearchResultMetadata> results);
-  // Update the whole model, usually when profile changes happen in Chrome.
-  SetModelData(array<AppListItemMetadata> apps,
-               bool is_search_engine_google);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces only used by ChromeAppListItem:
-  // These interfaces are called when an item's data is updated in Chrome.
-  // Updates an item's metadata (e.g. name, position, etc).
-  SetItemMetadata(string id, AppListItemMetadata metadata);
-  // Updates an item's icon.
-  SetItemIcon(string id, gfx.mojom.ImageSkia? icon);
-  // Updates whether an item is installing.
-  SetItemIsInstalling(string id, bool is_installing);
-  // Updates the downloaded percentage of an item.
-  SetItemPercentDownloaded(string id, int32 percent_downloaded);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces for item querying:
-  // Returns a map from each item's id to its shown index in the app list.
-  GetIdToAppListIndexMap() => (map<string, uint16> indices);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces for AppListSyncableService:
-  // These interfaces are called while dealing with the OEM folder in the
-  // AppListSyncableService in Chrome.
-  // Finds the OEM folder or creates one if it doesn't exist.
-  // |oem_folder_name|: the expected name of the OEM folder while creating.
-  // |preferred_oem_position|: the preferred position of the OEM folder while
-  //                           creating; if it's invalid then the final position
-  //                           is determined in Ash.
-  // |oem_folder|: the meta data of the existing/created OEM folder.
-  FindOrCreateOemFolder(
-      string oem_folder_name,
-      syncer.mojom.StringOrdinal preferred_oem_position)
-      => (AppListItemMetadata oem_folder);
-  // Resolves the position of the OEM folder.
-  // |preferred_oem_position|: the preferred position of the OEM folder; if it's
-  //                           invalid then the final position is determined in
-  //                           Ash.
-  // |oem_folder|: the meta data of the OEM folder, or null if it doesn't exist.
-  ResolveOemFolderPosition(
-      syncer.mojom.StringOrdinal preferred_oem_position)
-      => (AppListItemMetadata? oem_folder);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces for ChromeSearchReult:
-  SetSearchResultMetadata(SearchResultMetadata metadata);
-  SetSearchResultIsInstalling(string result_id, bool is_installing);
-  SetSearchResultPercentDownloaded(string result_id, int32 percent_downloaded);
-  NotifySearchResultItemInstalled(string result_id);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces for views:
-  // Dismisses the app list.
-  DismissAppList();
-  // Returns bounds of a rectangle to show an AppInfo dialog.
-  GetAppInfoDialogBounds() => (gfx.mojom.Rect bounds);
-  // Shows the app list and switches to |state|.
-  ShowAppListAndSwitchToState(AppListState state);
-  // Shows the app list.
-  ShowAppList();
-};
-
-// In contrast to AppListController, this client is implemented in Chrome to
-// handle calls from Ash. These include:
-// - When Chrome components are needed to get involved in the user's actions on
-//   app list views. This can happen while the user is searching, clicking on
-//   any app list item, etc.
-// - When view changes in Ash and we want to notify Chrome. This can happen
-//   while app list is performing animations.
-// - When a user action on views need information from Chrome to complete. This
-//   can happen while populating context menu models, which depends on item data
-//   in Chrome.
-interface AppListClient {
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces on searching:
-  // Triggers a search query.
-  // |trimmed_query|: the trimmed input texts from the search text field.
-  StartSearch(mojo_base.mojom.String16 trimmed_query);
-  // Opens a search result when its view is clicked or pressed.
-  // |result_id|: the id of the search result the user wants to open.
-  OpenSearchResult(string result_id, int32 event_flags);
-  // Invokes a custom action on a result with |result_id|.
-  // |action_index| corresponds to the index of an action on the search result,
-  // for example, installing. They are stored in SearchResult::actions_.
-  InvokeSearchResultAction(string result_id,
-                           int32 action_index,
-                           int32 event_flags);
-  // Returns the context menu model for the search result with |result_id|, or
-  // an empty array if there is currently no menu for the result.
-  GetSearchResultContextMenuModel(string result_id) => (array<MenuItem> items);
-  // Invoked when a context menu item of a search result is clicked.
-  // |result_id|: the clicked search result's id.
-  // |command_id|: the clicked menu item's command id.
-  // |event_flags|: flags from the event which triggered this command.
-  SearchResultContextMenuItemSelected(string result_id,
-                                      int32 command_id,
-                                      int32 event_flags);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces on the app list UI:
-  // Invoked when the app list is shown in the display with |display_id|.
-  ViewShown(int64 display_id);
-  // Invoked when the app list is closed.
-  ViewClosing();
-  // Notifies target visibility changes of the app list.
-  OnAppListTargetVisibilityChanged(bool visible);
-  // Notifies visibility changes of the app list.
-  OnAppListVisibilityChanged(bool visible);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces on app list items:
-  // Activates (opens) the item with |id|.
-  ActivateItem(string id, int32 event_flags);
-  // Returns the context menu model for the item with |id|, or an empty array if
-  // there is currently no menu for the item (e.g. during install).
-  GetContextMenuModel(string id) => (array<MenuItem> items);
-  // Invoked when a context menu item of an app list item is clicked.
-  // |id|: the clicked AppListItem's id.
-  // |command_id|: the clicked menu item's command id.
-  // |event_flags|: flags from the event which triggered this command.
-  ContextMenuItemSelected(string id, int32 command_id, int32 event_flags);
-  // Invoked when a folder is created in Ash (e.g. merge items into a folder).
-  OnFolderCreated(AppListItemMetadata folder);
-  // Invoked when a folder has only one item left and so gets removed.
-  OnFolderDeleted(AppListItemMetadata folder);
-  // Invoked when user changes a folder's name or an item's position.
-  OnItemUpdated(AppListItemMetadata folder);
-  // Invoked when a "page break" item is added with |id| and |position|.
-  OnPageBreakItemAdded(string id, syncer.mojom.StringOrdinal position);
-  // Invoked when a "page break" item with |id| is deleted.
-  OnPageBreakItemDeleted(string id);
-
-  //////////////////////////////////////////////////////////////////////////////
-  // Interfaces on voice interaction:
-  // Starts a voice interaction session.
-  StartVoiceInteractionSession();
-  // Starts or stops voice interaction session based on current state.
-  ToggleVoiceInteractionSession();
-};
--- a/src/ash/public/interfaces/app_list.typemap
+++ b/src/ash/public/interfaces/app_list.typemap
@ -1,21 +0,0 @@
-# Copyright 2018 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-mojom = "//ash/public/interfaces/app_list.mojom"
-public_headers = [ "//ash/public/cpp/app_list/app_list_types.h" ]
-traits_headers = [ "//ash/public/cpp/app_list/app_list_struct_traits.h" ]
-sources = [
-  "//ash/public/cpp/app_list/app_list_struct_traits.cc",
-]
-deps = [
-  "//ui/gfx/range/mojo:struct_traits",
-]
-type_mappings = [
-  "ash.mojom.AppListState=ash::AppListState",
-  "ash.mojom.AppListModelStatus=ash::AppListModelStatus",
-  "ash.mojom.SearchResultType=ash::SearchResultType",
-  "ash.mojom.SearchResultDisplayType=ash::SearchResultDisplayType",
-  "ash.mojom.SearchResultTag=ash::SearchResultTag",
-  "ash.mojom.SearchResultAction=ash::SearchResultAction",
-]
--- a/src/ash/public/interfaces/ash_display_controller.mojom
+++ b/src/ash/public/interfaces/ash_display_controller.mojom
@ -1,18 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-// Allows configuring various display related state.
-interface AshDisplayController {
-  // ============================ Virtual Terminal ============================
-
-  // Take control of all display output. This is called when switching from the
-  // virtual terminal back to Chrome in response to a dbus message.
-  TakeDisplayControl() => (bool status);
-
-  // Relinquish control of all display output. This is called when switching
-  // from Chrome to the virtual terminal in response to a dbus message.
-  RelinquishDisplayControl() => (bool status);
-};
--- a/src/ash/public/interfaces/ash_message_center_controller.mojom
+++ b/src/ash/public/interfaces/ash_message_center_controller.mojom
@ -1,98 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "components/arc/common/notifications.mojom";
-import "ui/gfx/image/mojo/image.mojom";
-import "ui/message_center/public/mojo/notification.mojom";
-import "ui/message_center/public/mojo/notifier_id.mojom";
-import "mojo/public/mojom/base/string16.mojom";
-import "mojo/public/mojom/base/unguessable_token.mojom";
-
-// A struct that contains information for presenting a notifier in a settings
-// panel.
-struct NotifierUiData {
-  // The notifier (e.g. an extension).
-  message_center.mojom.NotifierId notifier_id;
-
-  // The user-visible name of the notifier (e.g. an extension's name).
-  mojo_base.mojom.String16 name;
-
-  // True if notifications from the notifier are presently enabled.
-  bool enabled;
-
-  // True if the setting is enforced by administrator and the user can't change.
-  bool enforced;
-
-  // An icon displayed next to the name.
-  gfx.mojom.ImageSkia? icon;
-};
-
-// The message center controller funnels notification requests from the client
-// to the MessageCenter.
-interface AshMessageCenterController {
-  SetClient(associated AshMessageCenterClient client);
-
-  // Sets the ARC notification instance.
-  SetArcNotificationsInstance(arc.mojom.NotificationsInstance instance);
-
-  // Shows a notification. |display_token| will be used to reference this
-  // notification for AshMessageCenterClient::Close().
-  ShowClientNotification(message_center.mojom.Notification notification,
-                         mojo_base.mojom.UnguessableToken display_token);
-
-  // Closes a notification by the notification ID.
-  CloseClientNotification(string id);
-
-  UpdateNotifierIcon(message_center.mojom.NotifierId notifier_id,
-                     gfx.mojom.ImageSkia icon);
-
-  NotifierEnabledChanged(message_center.mojom.NotifierId notifier_id,
-                         bool enabled);
-
-  // Gets a list of all the notifications in the message center.
-  GetActiveNotifications() =>
-      (array<message_center.mojom.Notification> notifications);
-
-  // Changes the quiet mode state in the message center.
-  SetQuietMode(bool enabled);
-};
-
-// The message center client interface mimics
-// message_center::NotificationDelegate. The ID strings match the id passed in
-// |notification| in ShowClientNotification and the format of the ID is up to
-// the client.
-interface AshMessageCenterClient {
-  // Called when a notification previously displayed by the client is closed.
-  HandleNotificationClosed(mojo_base.mojom.UnguessableToken display_token,
-                           bool by_user);
-
-  // Called when the body of a notification is clicked.
-  HandleNotificationClicked(string id);
-
-  // Called when a notification that has buttons (e.g., "Learn more") receives a
-  // click on one of the buttons. |reply| is a user-provided string for cases
-  // where the button had a text input field attached to it.
-  HandleNotificationButtonClicked(string id, int32 button_index,
-                                  mojo_base.mojom.String16? reply);
-
-  // Called when a notification's settings button has been pressed (and the
-  // handler is SettingsButtonHandler::DELEGATE).
-  HandleNotificationSettingsButtonClicked(string id);
-
-  // Called when a notification has been disabled (via inline settings).
-  DisableNotification(string id);
-
-  // Called when a user enables or disables notifications from the given
-  // notifier.
-  SetNotifierEnabled(message_center.mojom.NotifierId notifier_id, bool enabled);
-
-  // Asks the client for a list of notifiers and associated UI information to be
-  // displayed in a settings panel.
-  GetNotifierList() => (array<NotifierUiData> notifiers);
-
-  // Gets ARC app id from a given package name.
-  GetArcAppIdByPackageName(string package_name) => (string app_id);
-};
--- a/src/ash/public/interfaces/ash_window_manager.mojom
+++ b/src/ash/public/interfaces/ash_window_manager.mojom
@ -1,30 +0,0 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-import "ui/events/mojo/event_constants.mojom";
-
-// The previewed snap state for a window, corresponding to the use of a
-// PhantomWindowController.
-enum SnapDirection {
-  kNone,   // No snap preview.
-  kLeft,   // The phantom window controller is previewing a snap to the left.
-  kRight,  // The phantom window controller is previewing a snap to the left.
-};
-
-// Interface exposed via WindowTree::BindWindowManagerInterface(). This
-// interface is used for functionality specific to Ash that is associated with
-// windows created by the window service.
-interface AshWindowManager {
-  AddWindowToTabletMode(uint64 window_id);
-
-  ShowSnapPreview(uint64 window_id, SnapDirection snap);
-
-  CommitSnap(uint64 window_id, SnapDirection snap);
-
-  // Maximizes the window in response to a double click or tap on the HTCAPTION
-  // area.
-  MaximizeWindowByCaptionClick(uint64 window_id, ui.mojom.PointerKind pointer);
-};
--- a/Show more
+++ b/Show more