Rename chromium_testshell target to chrome_shell_apk.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import hashlib
 import json
 import multiprocessing
@@ skipping 46 matching lines @@
       annotation=None, exclude_annotation=None, extra_flags=None):
   return I_TEST(name, apk, apk_package, test_apk, test_data, host_driven_root,
                 annotation, exclude_annotation, extra_flags)
 
 INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
     I('ContentShell',
       'ContentShell.apk',
       'org.chromium.content_shell_apk',
       'ContentShellTest',
       'content:content/test/data/android/device_files'),
-    I('ChromiumTestShell',
-      'ChromiumTestShell.apk',
+    I('ChromeShell',
+      'ChromeShell.apk',
       'org.chromium.chrome.shell',
-      'ChromiumTestShellTest',
+      'ChromeShellTest',
       'chrome:chrome/test/data/android/device_files',
-      constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
+      constants.CHROME_SHELL_HOST_DRIVEN_DIR),
     I('AndroidWebView',
       'AndroidWebView.apk',
       'org.chromium.android_webview.shell',
       'AndroidWebViewTest',
       'webview:android_webview/test/data/device_files'),
     ])
 
 VALID_TESTS = set(['chromedriver', 'gpu', 'ui', 'unit', 'webkit',
                    'webkit_layout', 'webrtc_chromium', 'webrtc_native'])
 
@@ skipping 66 matching lines @@
     if suite == 'content_browsertests':
       cmd.append('--num_retries=1')
     RunCmd(cmd)
 
 
 def RunChromeDriverTests(options):
   """Run all the steps for running chromedriver tests."""
   bb_annotations.PrintNamedStep('chromedriver_annotation')
   RunCmd(['chrome/test/chromedriver/run_buildbot_steps.py',
           '--android-packages=%s,%s,%s,%s' %
-          ('chromium_test_shell',
+          ('chrome_shell',
            'chrome_stable',
            'chrome_beta',
            'chromedriver_webview_shell'),
           '--revision=%s' % _GetRevision(options),
           '--update-log'])
 
 
 def InstallApk(options, test, print_step=False):
   """Install an apk to all phones.
 
@@ skipping 476 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))