Refactor and add special test runner to support Espresso tests

android_webview/tools/automated_ui_tests/BUILD.gn

Index: android_webview/tools/automated_ui_tests/BUILD.gn
diff --git a/android_webview/tools/automated_ui_tests/BUILD.gn b/android_webview/tools/automated_ui_tests/BUILD.gn
index 4b8b57814146764100724f5dd00ebf79badff2d9..190ef16277bbb76b92869c6629af496b17fea49e 100644
--- a/android_webview/tools/automated_ui_tests/BUILD.gn
+++ b/android_webview/tools/automated_ui_tests/BUILD.gn
@@ -15,7 +15,7 @@ group("webview_ui_test_app") {
 
 android_apk("webview_ui_test_app_apk") {
   apk_name = "WebViewUiTestApp"
-  android_manifest = "java/AndroidManifest.xml"
+  android_manifest = "apk/java/AndroidManifest.xml"
   deps = [
     ":webview_ui_test_app_apk_resources",
     ":webview_ui_test_app_java",
@@ -24,7 +24,7 @@ android_apk("webview_ui_test_app_apk") {
 
 android_library("webview_ui_test_app_java") {
   java_files =
-      [ "java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java" ]
+      [ "apk/java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java" ]
   deps = [
     ":webview_ui_test_app_apk_resources",
     "//base:base_java",
@@ -32,20 +32,32 @@ android_library("webview_ui_test_app_java") {
 }
 
 android_resources("webview_ui_test_app_apk_resources") {
-  resource_dirs = [ "java/res" ]
+  resource_dirs = [ "apk/java/res" ]
   custom_package = "org.chromium.webview_ui_test"
 }
 
 instrumentation_test_apk("webview_ui_test_app_test_apk") {
   apk_name = "WebViewUiTestAppTest"
-  android_manifest = "javatests/AndroidManifest.xml"
+  android_manifest = "apk/javatests/AndroidManifest.xml"
+  isolate_file = "../../automated_ui_tests.isolate"
   java_files = [
-    "javatests/src/org/chromium/webview_ui_test/test/LoadDataTest.java",
-    "javatests/src/org/chromium/webview_ui_test/test/WebViewTestBase.java",
+    "apk/javatests/src/org/chromium/webview_ui_test/test/LoadDataTest.java",
+    "apk/javatests/src/org/chromium/webview_ui_test/test/WebViewTestBase.java",
+    "apk/javatests/src/org/chromium/webview_ui_test/test/WebViewUiInstrumentationTestRunner.java",
+  ]
+  data = [
+    "test/data",
   ]
   deps = [
     ":webview_ui_test_app_apk_resources",
     ":webview_ui_test_app_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/espresso:espresso_core_java",
+    "//third_party/espresso:espresso_web_java",
+    "//third_party/hamcrest:hamcrest_core_java",
+    "//third_party/hamcrest:hamcrest_library_java",
     "//third_party/ub-uiautomator:ub_uiautomator_java",
   ]
   data_deps = [