Rename to ChromiumTestShell package from testshell to shell

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
@@ skipping 43 matching lines @@
         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(
-        'org.chromium.chrome.testshell',
-        'org.chromium.chrome.testshell.ChromiumTestShellActivity',
+        'org.chromium.chrome.shell',
+        'org.chromium.chrome.shell.ChromiumTestShellActivity',
         '/data/local/tmp/chromium-testshell-command-line',
         'chromium_testshell_devtools_remote',
-        'org.chromium.chrome.testshell.tests'),
+        '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',
         '/data/local/tmp/chrome-native-tests-command-line',
@@ skipping 106 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