[WebView] Add an isolate file to run the WebView Layout tests.

Adding an isolate file similiar to what exists for the
AndroidWebViewTest.apk to run the instrumentation test through
the isolate file.

BUG=

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

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

android_webview/android_webview_test_apk_run.isolate

@@ -8,10 +8,9 @@
   'variables': {
     'command': [
       '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
-       '--enable-platform-mode',
-       '-e', 'local',
-       '--apk-under-test', '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
-       '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [
       '../third_party/proguard/lib/proguard.jar',

android_webview/system_webview_shell_layout_test_apk_run.isolate

+# 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.
+{
+  'includes': [
+    '../build/android/android.isolate',
+  ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_system_webview_shell_layout_test_apk',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+    ],
+    'files': [
+      '../third_party/proguard/lib/proguard.jar',
+      '<(PRODUCT_DIR)/host_forwarder',
+      '<(PRODUCT_DIR)/forwarder_dist/',
+      '<(PRODUCT_DIR)/apks/SystemWebView.apk',
+      '<(PRODUCT_DIR)/apks/SystemWebViewShell.apk',
+      '<(PRODUCT_DIR)/apks/SystemWebViewShellLayoutTest.apk',
+      '<(PRODUCT_DIR)/bin/run_system_webview_shell_layout_test_apk',
+      '<(PRODUCT_DIR)/test.lib.java/SystemWebViewShellLayoutTest.jar',
+      'system_webview_shell_test_apk.isolate',
+      'tools/WebViewShell/test/',
+    ]
+  },
+}

android_webview/tools/BUILD.gn

@@ -45,6 +45,7 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
     "//content/public/test/android:content_java_test_support",
     "//testing/android/reporter:reporter_java",
   ]
+  additional_apks = [ "//android_webview:system_webview_apk" ]
 }
 
 # GYP: //android_webview/android_webview_shell.gypi:system_webview_shell_layout_test_apk
@@ -59,4 +60,5 @@ instrumentation_test_apk("system_webview_shell_layout_test_apk") {
     "//base:base_java_test_support",
     "//testing/android/reporter:reporter_java",
   ]
+  additional_apks = [ "//android_webview:system_webview_apk" ]
 }

chrome/android/chrome_public_test_apk.isolate

@@ -10,8 +10,7 @@
     'command': [
       '<(PRODUCT_DIR)/bin/run_chrome_public_test_apk',
       '--enable-platform-mode',
-      '-e', 'local', '--apk-under-test',
-      '<(PRODUCT_DIR)/apks/ChromePublic.apk',
+      '-e', 'local',
       '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [

chrome/android/chrome_sync_shell_test_apk.isolate

@@ -9,8 +9,7 @@
     'command': [
       '<(PRODUCT_DIR)/bin/run_chrome_sync_shell_test_apk',
       '--enable-platform-mode',
-      '-e', 'local', '--apk-under-test',
-      '<(PRODUCT_DIR)/apks/ChromeSyncShell.apk',
+      '-e', 'local',
       '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [

content/content_shell_test_apk_run.isolate

@@ -10,8 +10,7 @@
     'command': [
       '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
       '--enable-platform-mode',
-      '-e', 'local', '--apk-under-test',
-      '<(PRODUCT_DIR)/apks/ContentShell.apk',
+      '-e', 'local',
       '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
     ],
     'files': [