Rename chromium_testshell target to chrome_shell_apk.

build/all.gyp

 # 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': {
     # A hook that can be overridden in other repositories to add additional
     # compilation targets to 'All'. Only used on Android.
     'android_app_targets%': [],
   },
@@ skipping 31 matching lines @@
             '../ui/ui_unittests.gyp:ui_unittests',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             '../content/content_shell_and_tests.gyp:content_shell_apk',
             '../mojo/mojo.gyp:mojo_shell_apk',
             '<@(android_app_targets)',
             'android_builder_tests',
             '../android_webview/android_webview.gyp:android_webview_apk',
-            '../chrome/chrome.gyp:chromium_testshell',
+            '../chrome/chrome.gyp:chrome_shell_apk',
             '../remoting/remoting.gyp:remoting_apk',
             '../tools/telemetry/telemetry.gyp:*#host',
             # TODO(nyquist) This should instead by a target for sync when all of
             # the sync-related code for Android has been upstreamed.
             # See http://crbug.com/159203
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
           ],
         }, {
           'dependencies': [
             '../content/content_shell_and_tests.gyp:*',
@@ skipping 711 matching lines @@
                 '../gpu/gpu.gyp:gpu_unittests_apk',
                 '../ipc/ipc.gyp:ipc_tests_apk',
                 '../media/media.gyp:media_unittests_apk',
                 '../net/net.gyp:net_unittests_apk',
                 '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
                 '../sql/sql.gyp:sql_unittests_apk',
                 '../sync/sync.gyp:sync_unit_tests_apk',
                 '../ui/events/events.gyp:events_unittests_apk',
                 '../ui/ui_unittests.gyp:ui_unittests_apk',
                 '../android_webview/android_webview.gyp:android_webview_test_apk',
-                '../chrome/chrome.gyp:chromium_testshell_test_apk',
-                '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests',
+                '../chrome/chrome.gyp:chrome_shell_test_apk',
+                '../chrome/chrome.gyp:chrome_shell_uiautomator_tests',
                 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk'
               ],
             }],
           ],
         },
         {
           # WebRTC Android APK tests.
           'target_name': 'android_builder_webrtc',
           'type': 'none',
           'variables': {
@@ skipping 438 matching lines @@
             # http://crbug.com/157234
             #'../chrome/chrome.gyp:sync_integration_tests_run',
             '../chrome/chrome.gyp:unit_tests_run',
             '../net/net.gyp:net_unittests_run',
           ],
         }, # target_name: chromium_swarm_tests
       ],
     }],
   ], # conditions
 }