Rename chromium_testshell target to chrome_shell_apk.

chrome/chrome_tests.gypi

 # Copyright 2013 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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 2950 matching lines @@
             'test/security_tests/security_tests.cc',
             '../sandbox/win/tests/validation_tests/commands.cc',
             '../sandbox/win/tests/validation_tests/commands.h',
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
     ['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_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../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'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
           'target_name': 'chromedriver_webview_shell_apk',
           'type': 'none',
           'variables': {
             'apk_name': 'ChromeDriverWebViewShell',
             'java_in_dir': 'test/chromedriver/test/webview_shell/java',
             'resource_dir': 'test/chromedriver/test/webview_shell/java/res',
           },
           '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',
           },
           'dependencies': [
             '../base/base.gyp:base_java_test_support',
             '../third_party/android_tools/android_tools.gyp:uiautomator_jar',
           ],
           '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' ],
         },
         {
           'target_name': 'chrome_java_test_support',
           'type': 'none',
           'variables': {
             'package_name': 'chrome_java_test_support',
             'java_in_dir': '../chrome/test/android/javatests',
           },
@@ skipping 185 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
           ],
         }]
     }],
   ],  # 'conditions'
 }