[WebView] Reorganize all of the WebView Shell apks into their own dir.

Thought I could clean up the android_webview/tools dir a little bit.
It basically has some random tools as well as the WebViewShell apks
so I moved all the apks into a shared folder.

- Moved all WebViewShell Apks into tools/system_webview_shell
- Moved WebViewShell/test/ to system_webview_shell/test/data/ to better
match the naming of test data elsewhere
- Removed DEPRECATED_java_in_dir from tools/BUILD.gn.
- Updated gn_migration.gypi since GN targets exist for the WebView
Shell apks.

BUG=

Review URL: https://codereview.chromium.org/1785283005

Cr-Commit-Position: refs/heads/master@{#382390}

49 files changed, 40 insertions, 23 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 8fbd05c..52bb985 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -309,7 +309,7 @@ group("both_gn_and_gyp") {
       deps += [
         "//android_webview",
         "//android_webview/test",
-        "//android_webview/tools",
+        "//android_webview/tools/system_webview_shell",
         "//chrome/android:chrome_junit_tests",
         "//chrome/android:chrome_public_apk",
         "//chrome/android:chrome_public_test_apk",
diff --git a/android_webview/android_webview_shell.gyp b/android_webview/android_webview_shell.gyp
index 0af0dbe..f5a20d8 100644
--- a/android_webview/android_webview_shell.gyp
+++ b/android_webview/android_webview_shell.gyp
@@ -9,9 +9,9 @@
       'type': 'none',
       'variables': {
         'apk_name': 'SystemWebViewShell',
-        'java_in_dir': 'tools/WebViewShell',
-        'resource_dir': 'tools/WebViewShell/res',
-        'android_manifest_path': 'tools/WebViewShell/AndroidManifest.xml', # for lint
+        'java_in_dir': 'tools/system_webview_shell/apk',
+        'resource_dir': 'tools/system_webview_shell/apk/res',
+        'android_manifest_path': 'tools/system_webview_shell/apk/AndroidManifest.xml', # for lint
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -41,10 +41,10 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellPageCycler',
-        'java_in_dir': '../android_webview/tools/PageCycler',
+        'java_in_dir': '../android_webview/tools/system_webview_shell/page_cycler',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
-        'android_manifest_path': '../android_webview/tools/PageCycler/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/system_webview_shell/page_cycler/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -63,11 +63,11 @@
       ],
       'variables': {
         'apk_name': 'SystemWebViewShellLayoutTest',
-        'java_in_dir': '../android_webview/tools/WebViewShellTest',
+        'java_in_dir': '../android_webview/tools/system_webview_shell/layout_tests',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
         'isolate_file': 'system_webview_shell_test_apk.isolate',
-        'android_manifest_path': '../android_webview/tools/WebViewShellTest/AndroidManifest.xml',
+        'android_manifest_path': '../android_webview/tools/system_webview_shell/layout_tests/AndroidManifest.xml',
       },
       'includes': [
         '../build/java_apk.gypi',
diff --git a/android_webview/system_webview_shell_test_apk.isolate b/android_webview/system_webview_shell_test_apk.isolate
index 85e85d3..15f2a84 100644
--- a/android_webview/system_webview_shell_test_apk.isolate
+++ b/android_webview/system_webview_shell_test_apk.isolate
@@ -7,7 +7,7 @@
     ['OS=="android"', {
       'variables': {
         'files': [
-          '<(DEPTH)/android_webview/tools/WebViewShell/test/',
+          '<(DEPTH)/android_webview/tools/system_webview_shell/test/data/',
           '<(DEPTH)/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt',
           '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing.html',
           '<(DEPTH)/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt',
diff --git a/android_webview/tools/BUILD.gn b/android_webview/tools/system_webview_shell/BUILD.gn
index f10f66e..2d19ab9 100644
--- a/android_webview/tools/BUILD.gn
+++ b/android_webview/tools/system_webview_shell/BUILD.gn
@@ -8,7 +8,7 @@ import("//testing/test.gni")
 # Mark all targets as test only.
 testonly = true
 
-group("tools") {
+group("system_webview_shell") {
   deps = [
     ":system_webview_shell_apk",
     ":system_webview_shell_layout_test_apk",
@@ -19,8 +19,16 @@ group("tools") {
 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_apk
 android_apk("system_webview_shell_apk") {
   apk_name = "SystemWebViewShell"
-  DEPRECATED_java_in_dir = "WebViewShell/src"
-  android_manifest = "WebViewShell/AndroidManifest.xml"
+  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/WebViewBrowserActivity.java",
+    "apk/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java",
+  ]
+  android_manifest = "apk/AndroidManifest.xml"
   deps = [
     ":system_webview_shell_apk_resources",
     "//base:base_java",
@@ -28,7 +36,7 @@ android_apk("system_webview_shell_apk") {
 }
 
 android_resources("system_webview_shell_apk_resources") {
-  resource_dirs = [ "WebViewShell/res" ]
+  resource_dirs = [ "apk/res" ]
   custom_package = "org.chromium.webview_shell"
 }
 
@@ -36,8 +44,11 @@ android_resources("system_webview_shell_apk_resources") {
 instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
   apk_name = "SystemWebViewShellPageCycler"
   apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "PageCycler/AndroidManifest.xml"
-  DEPRECATED_java_in_dir = "PageCycler/src"
+  android_manifest = "page_cycler/AndroidManifest.xml"
+  java_files = [
+    "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
+    "page_cycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java",
+  ]
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
@@ -51,9 +62,12 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
 instrumentation_test_apk("system_webview_shell_layout_test_apk") {
   apk_name = "SystemWebViewShellLayoutTest"
   apk_under_test = ":system_webview_shell_apk"
-  android_manifest = "WebViewShellTest/AndroidManifest.xml"
-  DEPRECATED_java_in_dir = "WebViewShellTest/src"
-  isolate_file = "../system_webview_shell_test_apk.isolate"
+  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/WebViewLayoutTestRunner.java",
+  ]
+  isolate_file = "../../system_webview_shell_test_apk.isolate"
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
diff --git a/android_webview/tools/system_webview_shell/OWNERS b/android_webview/tools/system_webview_shell/OWNERS
new file mode 100644
index 0000000..1fd89e0
--- /dev/null
+++ b/android_webview/tools/system_webview_shell/OWNERS
@@ -0,0 +1 @@
+timvolodine@chromium.org
diff --git a/android_webview/tools/WebViewShell/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
index 3309a31..3309a31 100644
--- a/android_webview/tools/WebViewShell/AndroidManifest.xml
+++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
diff --git a/android_webview/tools/WebViewShell/OWNERS b/android_webview/tools/system_webview_shell/apk/OWNERS
index e052263..e052263 100644
--- a/android_webview/tools/WebViewShell/OWNERS
+++ b/android_webview/tools/system_webview_shell/apk/OWNERS
diff --git a/android_webview/tools/WebViewShell/res/drawable/breadcrumb_arrow_black.png b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/breadcrumb_arrow_black.png
index 7b9ff79..7b9ff79 100644
--- a/android_webview/tools/WebViewShell/res/drawable/breadcrumb_arrow_black.png
+++ b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/breadcrumb_arrow_black.png
diff --git a/android_webview/tools/WebViewShell/res/drawable/ic_launcher.png b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/ic_launcher.png
index 96a442e..96a442e 100644
--- a/android_webview/tools/WebViewShell/res/drawable/ic_launcher.png
+++ b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/ic_launcher.png
diff --git a/android_webview/tools/WebViewShell/res/drawable/item_more_black.png b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/item_more_black.png
index b984062..b984062 100644
--- a/android_webview/tools/WebViewShell/res/drawable/item_more_black.png
+++ b/android_webview/tools/system_webview_shell/apk/res/drawable-mdpi/item_more_black.png
diff --git a/android_webview/tools/WebViewShell/res/layout/activity_webview.xml b/android_webview/tools/system_webview_shell/apk/res/layout/activity_webview.xml
index 547bb2c..547bb2c 100644
--- a/android_webview/tools/WebViewShell/res/layout/activity_webview.xml
+++ b/android_webview/tools/system_webview_shell/apk/res/layout/activity_webview.xml
diff --git a/android_webview/tools/WebViewShell/res/layout/activity_webview_browser.xml b/android_webview/tools/system_webview_shell/apk/res/layout/activity_webview_browser.xml
index 07483c5..07483c5 100644
--- a/android_webview/tools/WebViewShell/res/layout/activity_webview_browser.xml
+++ b/android_webview/tools/system_webview_shell/apk/res/layout/activity_webview_browser.xml
diff --git a/android_webview/tools/WebViewShell/res/menu/main_menu.xml b/android_webview/tools/system_webview_shell/apk/res/menu/main_menu.xml
index f577c7c..f577c7c 100644
--- a/android_webview/tools/WebViewShell/res/menu/main_menu.xml
+++ b/android_webview/tools/system_webview_shell/apk/res/menu/main_menu.xml
diff --git a/android_webview/tools/WebViewShell/res/values/strings.xml b/android_webview/tools/system_webview_shell/apk/res/values/strings.xml
index 3dfcc78..3dfcc78 100644
--- a/android_webview/tools/WebViewShell/res/values/strings.xml
+++ b/android_webview/tools/system_webview_shell/apk/res/values/strings.xml
diff --git a/android_webview/tools/WebViewShell/run_startup_time_test.sh b/android_webview/tools/system_webview_shell/apk/run_startup_time_test.sh
index 50ac7f3..50ac7f3 100755
--- a/android_webview/tools/WebViewShell/run_startup_time_test.sh
+++ b/android_webview/tools/system_webview_shell/apk/run_startup_time_test.sh
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/JankActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/JankActivity.java
index 13390b7..13390b7 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/JankActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/JankActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/PageCyclerTestActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/PageCyclerTestActivity.java
index 632c1e9..632c1e9 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/PageCyclerTestActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/PageCyclerTestActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/StartupTimeActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/StartupTimeActivity.java
index e5c4605..e5c4605 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/StartupTimeActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/StartupTimeActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/TelemetryActivity.java
index 654f641..654f641 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/TelemetryActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java
index f0b8a7e..f0b8a7e 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java
index 2aee9e3..2aee9e3 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewBrowserActivity.java
diff --git a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java
index ddbd6e5..ddbd6e5 100644
--- a/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java
+++ b/android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java
diff --git a/android_webview/tools/WebViewShellTest/AndroidManifest.xml b/android_webview/tools/system_webview_shell/layout_tests/AndroidManifest.xml
index 00ebd4c..00ebd4c 100644
--- a/android_webview/tools/WebViewShellTest/AndroidManifest.xml
+++ b/android_webview/tools/system_webview_shell/layout_tests/AndroidManifest.xml
diff --git a/android_webview/tools/WebViewShellTest/OWNERS b/android_webview/tools/system_webview_shell/layout_tests/OWNERS
index e052263..e052263 100644
--- a/android_webview/tools/WebViewShellTest/OWNERS
+++ b/android_webview/tools/system_webview_shell/layout_tests/OWNERS
diff --git a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
index 93276d2..93b0029 100644
--- a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
+++ b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java
@@ -35,7 +35,8 @@ public class WebViewLayoutTest
 
     private static final String EXTERNAL_PREFIX =
             Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
-    private static final String BASE_WEBVIEW_TEST_PATH = "android_webview/tools/WebViewShell/test/";
+    private static final String BASE_WEBVIEW_TEST_PATH =
+            "android_webview/tools/system_webview_shell/test/data/";
     private static final String BASE_BLINK_TEST_PATH = "third_party/WebKit/LayoutTests/";
     private static final String BASE_BLINK_STABLE_TEST_PATH =
             BASE_BLINK_TEST_PATH + "virtual/stable/";
diff --git a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
index 44b745f..44b745f 100644
--- a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
+++ b/android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java
diff --git a/android_webview/tools/PageCycler/AndroidManifest.xml b/android_webview/tools/system_webview_shell/page_cycler/AndroidManifest.xml
index 1b75a5c..1b75a5c 100644
--- a/android_webview/tools/PageCycler/AndroidManifest.xml
+++ b/android_webview/tools/system_webview_shell/page_cycler/AndroidManifest.xml
diff --git a/android_webview/tools/PageCycler/DEPS b/android_webview/tools/system_webview_shell/page_cycler/DEPS
index d8dc2b0..d8dc2b0 100644
--- a/android_webview/tools/PageCycler/DEPS
+++ b/android_webview/tools/system_webview_shell/page_cycler/DEPS
diff --git a/android_webview/tools/PageCycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java b/android_webview/tools/system_webview_shell/page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java
index bc29b7b..bc29b7b 100644
--- a/android_webview/tools/PageCycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java
+++ b/android_webview/tools/system_webview_shell/page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java
diff --git a/android_webview/tools/PageCycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java b/android_webview/tools/system_webview_shell/page_cycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java
index 5532c51..5532c51 100644
--- a/android_webview/tools/PageCycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java
+++ b/android_webview/tools/system_webview_shell/page_cycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.java
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/battery-status/battery-callback-expected.txt b/android_webview/tools/system_webview_shell/test/data/blink-apis/battery-status/battery-callback-expected.txt
index 2d7be9a..2d7be9a 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/battery-status/battery-callback-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/battery-status/battery-callback-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/battery-status/battery-callback.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/battery-status/battery-callback.html
index fd9a2e1..fd9a2e1 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/battery-status/battery-callback.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/battery-status/battery-callback.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/geolocation/geolocation-permission-callbacks-expected.txt b/android_webview/tools/system_webview_shell/test/data/blink-apis/geolocation/geolocation-permission-callbacks-expected.txt
index 708e1b0..708e1b0 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/geolocation/geolocation-permission-callbacks-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/geolocation/geolocation-permission-callbacks-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/geolocation/geolocation-permission-callbacks.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/geolocation/geolocation-permission-callbacks.html
index d947758..d947758 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/geolocation/geolocation-permission-callbacks.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/geolocation/geolocation-permission-callbacks.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-expected.txt b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-expected.txt
index a758a32..a758a32 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-permission-denied-expected.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-permission-denied-expected.html
index 6db4ae5..6db4ae5 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-permission-denied-expected.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-permission-denied-expected.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-permission-denied.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-permission-denied.html
index aabd8c1..aabd8c1 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess-permission-denied.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess-permission-denied.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess.html
index 58258be..58258be 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webmidi/requestmidiaccess.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webmidi/requestmidiaccess.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-callbacks-expected.txt b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-callbacks-expected.txt
index c4ebe15..c4ebe15 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-callbacks-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-callbacks-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-callbacks.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-callbacks.html
index 7db56fc..7db56fc 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-callbacks.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-callbacks.html
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-permission-denied-callbacks-expected.txt b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-permission-denied-callbacks-expected.txt
index e753b5a..e753b5a 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-permission-denied-callbacks-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-permission-denied-callbacks-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-permission-denied-callbacks.html b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-permission-denied-callbacks.html
index 3eef13b..3eef13b 100644
--- a/android_webview/tools/WebViewShell/test/blink-apis/webrtc/mediastream-permission-denied-callbacks.html
+++ b/android_webview/tools/system_webview_shell/test/data/blink-apis/webrtc/mediastream-permission-denied-callbacks.html
diff --git a/android_webview/tools/WebViewShell/test/experimental/basic-logging-expected.txt b/android_webview/tools/system_webview_shell/test/data/experimental/basic-logging-expected.txt
index 6031faa..6031faa 100644
--- a/android_webview/tools/WebViewShell/test/experimental/basic-logging-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/experimental/basic-logging-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/experimental/basic-logging.html b/android_webview/tools/system_webview_shell/test/data/experimental/basic-logging.html
index 5f96087..5f96087 100644
--- a/android_webview/tools/WebViewShell/test/experimental/basic-logging.html
+++ b/android_webview/tools/system_webview_shell/test/data/experimental/basic-logging.html
diff --git a/android_webview/tools/WebViewShell/test/resources/js-test.js b/android_webview/tools/system_webview_shell/test/data/resources/js-test.js
index 0b90805..0b90805 100644
--- a/android_webview/tools/WebViewShell/test/resources/js-test.js
+++ b/android_webview/tools/system_webview_shell/test/data/resources/js-test.js
diff --git a/android_webview/tools/WebViewShell/test/run_tests.sh b/android_webview/tools/system_webview_shell/test/data/run_tests.sh
index 9c7ff27..10e43a9 100755
--- a/android_webview/tools/WebViewShell/test/run_tests.sh
+++ b/android_webview/tools/system_webview_shell/test/data/run_tests.sh
@@ -5,7 +5,8 @@
 # found in the LICENSE file.
 
 PACKAGE_NAME="org.chromium.webview_shell.test"
-DEVICE_WEBVIEW_TEST_PATH="/sdcard/android_webview/tools/WebViewShell/test/"
+DEVICE_WEBVIEW_TEST_PATH=\
+    "/sdcard/android_webview/tools/system_webview_shell/test/data/"
 TESTRUNNER="../../../../build/android/test_runner.py"
 
 $TESTRUNNER instrumentation \
diff --git a/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt
index 711ca19..711ca19 100644
--- a/android_webview/tools/WebViewShell/test/webexposed/global-interface-listing-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt
diff --git a/android_webview/tools/WebViewShell/test/webexposed/not-webview-exposed.txt b/android_webview/tools/system_webview_shell/test/data/webexposed/not-webview-exposed.txt
index 7dd704e..7dd704e 100644
--- a/android_webview/tools/WebViewShell/test/webexposed/not-webview-exposed.txt
+++ b/android_webview/tools/system_webview_shell/test/data/webexposed/not-webview-exposed.txt
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index bbbce06..df3b52c 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -253,6 +253,9 @@
         }],
         ['OS=="android" and chromecast==0', {
           'dependencies': [
+            '../android_webview/android_webview_shell.gyp:system_webview_shell_apk',
+            '../android_webview/android_webview_shell.gyp:system_webview_shell_layout_test_apk',
+            '../android_webview/android_webview_shell.gyp:system_webview_shell_page_cycler_apk',
             '../chrome/android/chrome_apk.gyp:chrome_public_apk',
             '../chrome/android/chrome_apk.gyp:chrome_public_test_apk',
             '../chrome/android/chrome_apk.gyp:chrome_sync_shell_apk',
@@ -766,9 +769,6 @@
             '../android_webview/android_webview.gyp:android_webview_test_apk',
             '../android_webview/android_webview.gyp:android_webview_unittests',
             '../android_webview/android_webview.gyp:android_webview_unittests_apk',
-            '../android_webview/android_webview_shell.gyp:system_webview_shell_apk',
-            '../android_webview/android_webview_shell.gyp:system_webview_shell_layout_test_apk',
-            '../android_webview/android_webview_shell.gyp:system_webview_shell_page_cycler_apk',
           ],
         }],
         ['OS=="android" and chromecast==0 and use_webview_internal_framework==0', {