Make android_webview_test fit isolate naming convention.

This allows use of the gtest test generator and easy swarming.

https://codereview.chromium.org/1915003004/ is the build-side change.
https://chromereviews.googleplex.com/411237013/ is the build_internal-side change.

BUG=525873

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

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

android_webview/android_webview_test_apk.isolate

-# Copyright (c) 2014 The Chromium Authors. All rights reserved.
+# 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.
 {
-  'conditions': [
-    ['OS=="android"', {
-      'variables': {
-        'files': [
-          '<(DEPTH)/android_webview/test/data/',
-        ],
-      },
-    }],
+  'includes': [
+    '../build/android/android.isolate',
   ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_android_webview_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)/android_webview_test_apk/',
+      '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
+      '<(PRODUCT_DIR)/apks/AndroidWebViewTest.apk',
+      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
+      '<(PRODUCT_DIR)/test.lib.java/AndroidWebViewTest.jar',
+      'android_webview_test_data.isolate',
+      'test/data/',
+    ]
+  },
 }

android_webview/android_webview_test_apk_run.isolate

-# 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.
-{
-  'includes': [
-    '../build/android/android.isolate',
-  ],
-  'variables': {
-    'command': [
-      '<(PRODUCT_DIR)/bin/run_android_webview_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)/android_webview_test_apk/',
-      '<(PRODUCT_DIR)/apks/AndroidWebView.apk',
-      '<(PRODUCT_DIR)/apks/AndroidWebViewTest.apk',
-      '<(PRODUCT_DIR)/bin/run_android_webview_test_apk',
-      '<(PRODUCT_DIR)/test.lib.java/AndroidWebViewTest.jar',
-      'android_webview_test_apk.isolate',
-      'test/data/',
-    ]
-  },
-}

android_webview/android_webview_test_data.isolate

+# Copyright (c) 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.
+{
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'files': [
+          '<(DEPTH)/android_webview/test/data/',
+        ],
+      },
+    }],
+  ],
+}

android_webview/android_webview_tests.gypi

@@ -116,7 +116,7 @@
         'java_in_dir': '../android_webview/javatests',
         'is_test_apk': 1,
         'test_type': 'instrumentation',
-        'isolate_file': 'android_webview_test_apk.isolate',
+        'isolate_file': 'android_webview_test_data.isolate',
       },
       'includes': [
         '../build/java_apk.gypi',
@@ -256,7 +256,7 @@
               '../build/isolate.gypi',
             ],
             'sources': [
-              'android_webview_test_apk_run.isolate',
+              'android_webview_test_apk.isolate',
             ],
           },
           {

android_webview/test/BUILD.gn

@@ -204,7 +204,7 @@ instrumentation_test_apk("android_webview_test_apk") {
     "../javatests/src/org/chromium/android_webview/test/util/VideoTestUtil.java",
     "../javatests/src/org/chromium/android_webview/test/util/VideoTestWebServer.java",
   ]
-  isolate_file = "../android_webview_test_apk.isolate"
+  isolate_file = "../android_webview_test_data.isolate"
 }
 
 # GYP: //android_webview/android_webview_tests.gypi:android_webview_unittests

build/android/buildbot/bb_device_steps.py

@@ -75,7 +75,7 @@ INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files',
-      isolate_file_path='android_webview/android_webview_test_apk.isolate'),
+      isolate_file_path='android_webview/android_webview_test_data.isolate'),
     I('ChromeSyncShell',
       'ChromeSyncShell.apk',
       'org.chromium.chrome.browser.sync',