Rename chromium_testshell target to chrome_shell_apk.

chrome/chrome_android.gypi

Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 9afe7dd9912d96110c500fa188d8f93dc5837e28..1109343998186e4a994e33da37a41ef8d6818bd6 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -4,14 +4,14 @@
 {
   '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',
@@ -23,10 +23,10 @@
         # 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',
@@ -46,21 +46,21 @@
       ],
     },
     {
-      '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)',
@@ -69,14 +69,16 @@
       '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' ],
     },
@@ -112,7 +114,7 @@
       },
     },
     {
-      'target_name': 'chromium_testshell_paks',
+      'target_name': 'chrome_shell_paks',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',