Rename chromium_testshell target to chrome_shell_apk.

build/android/pylib/constants.py

 # 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.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 import collections
 import logging
 import os
 import subprocess
 import sys
 
 
 DIR_SOURCE_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                                os.pardir, os.pardir, os.pardir))
 ISOLATE_DEPS_DIR = os.path.join(DIR_SOURCE_ROOT, 'isolate_deps_dir')
 
-CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR = os.path.join(
+CHROME_SHELL_HOST_DRIVEN_DIR = os.path.join(
     DIR_SOURCE_ROOT, 'chrome', 'android')
 
 
 PackageInfo = collections.namedtuple('PackageInfo',
     ['package', 'activity', 'cmdline_file', 'devtools_socket',
      'test_package'])
 
 PACKAGE_INFO = {
     'chrome': PackageInfo(
         'com.google.android.apps.chrome',
@@ skipping 24 matching lines @@
         'com.android.browser.BrowserActivity',
         None,
         None,
         None),
     'content_shell': PackageInfo(
         'org.chromium.content_shell_apk',
         'org.chromium.content_shell_apk.ContentShellActivity',
         '/data/local/tmp/content-shell-command-line',
         None,
         'org.chromium.content_shell_apk.tests'),
-    'chromium_test_shell': PackageInfo(
+    'chrome_shell': PackageInfo(
         'org.chromium.chrome.shell',
         'org.chromium.chrome.shell.ChromeShellActivity',
-        '/data/local/tmp/chromium-testshell-command-line',
-        'chromium_testshell_devtools_remote',
+        '/data/local/tmp/chrome-shell-command-line',
+        'chrome_shell_devtools_remote',
         'org.chromium.chrome.shell.tests'),
     'android_webview_shell': PackageInfo(
         'org.chromium.android_webview.shell',
         'org.chromium.android_webview.shell.AwShellActivity',
         None,
         None,
         'org.chromium.android_webview.test'),
     'gtest': PackageInfo(
         'org.chromium.native_test',
         'org.chromium.native_test.ChromeNativeTestActivity',
@@ skipping 111 matching lines @@
       subprocess.call(['adb', 'version'], stdout=devnull, stderr=devnull)
     return 'adb'
   except OSError:
     logging.debug('No adb found in $PATH, fallback to checked in binary.')
     return os.path.join(ANDROID_SDK_ROOT, 'platform-tools', 'adb')
 
 
 # Exit codes
 ERROR_EXIT_CODE = 1
 WARNING_EXIT_CODE = 88