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

android_webview/tools/webview_shell/BUILD.gn

 # 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("tools") {
+group("webview_shell") {
   deps = [
     ":system_webview_shell_apk",
     ":system_webview_shell_layout_test_apk",
     ":system_webview_shell_page_cycler_apk",
   ]
 }
 
 # 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"
+  java_files = [
+    "WebViewShell/src/org/chromium/webview_shell/JankActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/PageCyclerTestActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/StartupTimeActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/TelemetryActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/TelemetryMemoryPressureActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/WebViewBrowserActivity.java",
+    "WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTestActivity.java",
+  ]
   android_manifest = "WebViewShell/AndroidManifest.xml"
   deps = [
     ":system_webview_shell_apk_resources",
     "//base:base_java",
   ]
 }
 
 android_resources("system_webview_shell_apk_resources") {
   resource_dirs = [ "WebViewShell/res" ]
   custom_package = "org.chromium.webview_shell"
 }
 
 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_page_cycler_apk
 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"
+  java_files = [
+    "PageCycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
+    "PageCycler/src/org/chromium/webview_shell/page_cycler/WebViewPageCyclerTestRunner.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",
   ]
 }
 
 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_test_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 = "LayoutTests/AndroidManifest.xml"
+  java_files = [
+    "LayoutTests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java",
+    "LayoutTests/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",
     "//testing/android/reporter:reporter_java",
   ]
 }