Rename chromium_testshell target to chrome_shell_apk.

chrome/chrome_android.gypi

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
-    'package_name': 'chromium_testshell',
+    'package_name': 'chrome_shell_apk',
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
   'targets': [
     {
-      'target_name': 'libchromiumtestshell',
+      'target_name': 'libchromeshell',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         'chrome_android_core',
         'chrome.gyp:browser_ui',
         '../content/content.gyp:content_app_browser',
       ],
       'sources': [
         # This file must always be included in the shared_library step to ensure
         # JNI_OnLoad is exported.
         'app/android/chrome_jni_onload.cc',
-        'android/shell/chrome_main_delegate_testshell_android.cc',
-        'android/shell/chrome_main_delegate_testshell_android.h',
-        "android/shell/testshell_google_location_settings_helper.cc",
-        "android/shell/testshell_google_location_settings_helper.h",
+        'android/shell/chrome_main_delegate_chrome_shell_android.cc',
+        'android/shell/chrome_main_delegate_chrome_shell_android.h',
+        "android/shell/chrome_shell_google_location_settings_helper.cc",
+        "android/shell/chrome_shell_google_location_settings_helper.h",
       ],
       'include_dirs': [
         '../skia/config',
       ],
       'conditions': [
         [ 'order_profiling!=0', {
           'conditions': [
             [ 'OS=="android"', {
               'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
             }],
           ],
         }],
         [ 'android_use_tcmalloc==1', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator', ],
         }],
       ],
     },
     {
-      'target_name': 'chromium_testshell',
+      'target_name': 'chrome_shell_apk',
       'type': 'none',
       'dependencies': [
         'chrome_java',
-        'chromium_testshell_paks',
-        'libchromiumtestshell',
+        'chrome_shell_paks',
+        'libchromeshell',
         '../media/media.gyp:media_java',
       ],
       'variables': {
-        'apk_name': 'ChromiumTestShell',
+        'apk_name': 'ChromeShell',
         'manifest_package_name': 'org.chromium.chrome.shell',
         'java_in_dir': 'android/shell/java',
         'resource_dir': 'android/shell/res',
         'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
-        'native_lib_target': 'libchromiumtestshell',
+        'native_lib_target': 'libchromeshell',
         'native_lib_version_name': '<(version_full)',
         'additional_input_paths': [
           '<@(chrome_android_pak_output_resources)',
         ],
       },
       'includes': [ '../build/java_apk.gypi', ],
     },
     {
-      # chromium_testshell creates a .jar as a side effect. Any java targets
+      # chrome_shell_apk creates a .jar as a side effect. Any java targets
       # that need that .jar in their classpath should depend on this target,
-      # chromium_testshell_java. Dependents of chromium_testshell receive its
+      # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its
       # jar path in the variable 'apk_output_jar_path'.
-      'target_name': 'chromium_testshell_java',
+      # This target should only be used by targets which instrument
+      # chrome_shell_apk.
+      'target_name': 'chrome_shell_apk_java',
       'type': 'none',
       'dependencies': [
-        'chromium_testshell',
+        'chrome_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
     {
       'target_name': 'chrome_android_core',
       'type': 'static_library',
       'dependencies': [
         'chrome.gyp:browser',
         'chrome.gyp:browser_ui',
         'chrome.gyp:plugin',
@@ skipping 15 matching lines @@
         'app/chrome_main_delegate.h',
       ],
       'link_settings': {
         'libraries': [
           '-landroid',
           '-ljnigraphics',
         ],
       },
     },
     {
-      'target_name': 'chromium_testshell_paks',
+      'target_name': 'chrome_shell_paks',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
       ],
       'copies': [
         {
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [
             '<@(chrome_android_pak_input_resources)',
           ],
         }
       ],
     },
   ],
 }