Make content_shell_test fit isolate naming convention.

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

https://chromereviews.googleplex.com/412157013/ is the corresponding internal build CL.

BUG=525873

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

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

build/android/buildbot/bb_device_steps.py

@@ -63,7 +63,7 @@ def I(name, apk, apk_package, test_apk, test_data, isolate_file_path=None,
       'org.chromium.content_shell_apk',
       'ContentShellTest',
       'content:content/test/data/android/device_files',
-      isolate_file_path='content/content_shell_test_apk.isolate'),
+      isolate_file_path='content/content_shell_test_data.isolate'),
     I('ChromePublic',
       'ChromePublic.apk',
       'org.chromium.chrome',

content/content_shell_test_apk.isolate

@@ -1,21 +1,25 @@
-# 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)/content/test/data/android/',
-          '<(DEPTH)/content/test/data/media/session/',
-          '<(DEPTH)/net/data/ssl/certificates/crit-codeSigning-chain.pem',
-          '<(DEPTH)/net/data/ssl/certificates/eku-test-root.pem',
-          '<(DEPTH)/net/data/ssl/certificates/invalid_key_usage_cert.der',
-          '<(DEPTH)/net/data/ssl/certificates/non-crit-codeSigning-chain.pem',
-          '<(DEPTH)/net/data/ssl/certificates/ok_cert.pem',
-          '<(DEPTH)/net/data/ssl/certificates/root_ca_cert.pem',
-        ],
-      },
-    }],
+  'includes': [
+    '../build/android/android.isolate',
+    'content_shell_test_data.isolate',
   ],
+  'variables': {
+    'command': [
+      '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
+      '--enable-platform-mode',
+      '-e', 'local',
+      '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+    ],
+    'files': [
+      '../third_party/proguard/',
+      '<(PRODUCT_DIR)/apks/ContentShell.apk',
+      '<(PRODUCT_DIR)/apks/ContentShellTest.apk',
+      '<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
+      '<(PRODUCT_DIR)/test.lib.java/ContentShellTest.jar',
+      'content_shell_test_data.isolate',
+    ]
+  },
 }

content/content_shell_test_data.isolate

@@ -0,0 +1,21 @@
+# 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)/content/test/data/android/',
+          '<(DEPTH)/content/test/data/media/session/',
+          '<(DEPTH)/net/data/ssl/certificates/crit-codeSigning-chain.pem',
+          '<(DEPTH)/net/data/ssl/certificates/eku-test-root.pem',
+          '<(DEPTH)/net/data/ssl/certificates/invalid_key_usage_cert.der',
+          '<(DEPTH)/net/data/ssl/certificates/non-crit-codeSigning-chain.pem',
+          '<(DEPTH)/net/data/ssl/certificates/ok_cert.pem',
+          '<(DEPTH)/net/data/ssl/certificates/root_ca_cert.pem',
+        ],
+      },
+    }],
+  ],
+}

content/content_tests.gypi

@@ -2101,7 +2101,7 @@
             'additional_src_dirs': ['public/android/javatests/', ],
             'is_test_apk': 1,
             'test_type': 'instrumentation',
-            'isolate_file': 'content_shell_test_apk.isolate',
+            'isolate_file': 'content_shell_test_data.isolate',
           },
           'includes': [
             '../build/java_apk.gypi',
@@ -2159,7 +2159,7 @@
                   '../build/isolate.gypi',
                 ],
                 'sources': [
-                  'content_shell_test_apk_run.isolate',
+                  'content_shell_test_apk.isolate',
                 ],
               },
               {

content/shell/android/BUILD.gn

@@ -160,7 +160,7 @@ instrumentation_test_apk("content_shell_test_apk") {
   apk_under_test = ":content_shell_apk"
   apk_name = "ContentShellTest"
   android_manifest = "javatests/AndroidManifest.xml"
-  isolate_file = "../../content_shell_test_apk.isolate"
+  isolate_file = "../../content_shell_test_data.isolate"
 }
 
 if (current_cpu != "x64") {