Rename chromium_testshell target to chrome_shell_apk.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index c592d3996bb25622c40d259d48cb1ade10f0a23b..abdb41cf58bde1f1fd5888eedfbccbd48cea550d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2974,11 +2974,11 @@
     ['OS == "android"', {
       'targets': [
         {
-          'target_name': 'chromium_testshell_test_apk',
+          'target_name': 'chrome_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'chrome_java',
-            'chromium_testshell_java',
+            'chrome_shell_apk_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
@@ -2986,7 +2986,7 @@
             '../sync/sync.gyp:sync_javatests',
           ],
           'variables': {
-            'apk_name': 'ChromiumTestShellTest',
+            'apk_name': 'ChromeShellTest',
             'java_in_dir': 'android/shell/javatests',
             'resource_dir': 'android/shell/res',
             'additional_src_dirs': ['android/javatests/src'],
@@ -3005,7 +3005,7 @@
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
-          'target_name': 'chromium_testshell_uiautomator_tests_java',
+          'target_name': 'chrome_shell_uiautomator_tests_java',
           'type': 'none',
           'variables': {
             'java_in_dir': 'android/uiautomator_tests',
@@ -3017,10 +3017,10 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
-          'target_name': 'chromium_testshell_uiautomator_tests',
+          'target_name': 'chrome_shell_uiautomator_tests',
           'type': 'none',
           'dependencies': [
-            'chromium_testshell_uiautomator_tests_java',
+            'chrome_shell_uiautomator_tests_java',
           ],
           'includes': [ '../build/uiautomator_test.gypi' ],
         },