Cleanup: Remove the remaining instances of ChromiumTestShell from Telemetry scripts.

Chrome shell is still being referred as ChromiumTestShell in
some places, especially in the telemetry scripts. This
cleanup has dependency on changes in the buildbot
scripts as well where we are invoking the telemetry scripts
as ChromiumTestShell. The buildbot changes are uploaded as
part of https://crrev.com/302743002 to correct invocation as
ChromeShell instead ChromiumTestShell.

BUG=355730

Review URL: https://codereview.chromium.org/302653004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274857 0039d316-1c4b-4281-b951-d872f2087c98

build/android/buildbot/bb_device_steps.py

@@ -148,7 +148,7 @@ def RunTelemetryPerfUnitTests(options):
     options: options object.
   """
   InstallApk(options, INSTRUMENTATION_TESTS['ChromeShell'], False)
-  args = ['--browser', 'android-chromium-testshell']
+  args = ['--browser', 'android-chrome-shell']
   devices = android_commands.GetAttachedDevices()
   if devices:
     args = args + ['--device', devices[0]]

tools/cr/cr/targets/chrome_shell.py

@@ -20,6 +20,6 @@ class ChromeShellTarget(cr.NamedTarget):
 class ChromeShellTestTarget(cr.NamedTarget):
   NAME = 'chrome_shell_test'
   CONFIG = cr.Config.From(
-      CR_TARGET_NAME='ChromiumTestShellTest',
+      CR_TARGET_NAME='ChromeShellTest',
   )
 

tools/telemetry/docs/telemetry.core.browser_finder.html

@@ -190,6 +190,6 @@ Raises:<br>
 <font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
     
 <tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
-<td width="100%"><strong>ALL_BROWSER_TYPES</strong> = ['exact', 'release', 'release_x64', 'debug', 'debug_x64', 'canary', 'content-shell-debug', 'content-shell-debug_x64', 'content-shell-release', 'content-shell-release_x64', 'system', 'android-chrome-beta', 'android-chrome-dev', 'android-chromium-testshell', 'android-jb-system-chrome', 'android-chrome-canary', 'android-chrome', 'android-webview', 'android-content-shell', 'cros-chrome', ...]<br>
+<td width="100%"><strong>ALL_BROWSER_TYPES</strong> = ['exact', 'release', 'release_x64', 'debug', 'debug_x64', 'canary', 'content-shell-debug', 'content-shell-debug_x64', 'content-shell-release', 'content-shell-release_x64', 'system', 'android-chrome-beta', 'android-chrome-dev', 'android-chrome-shell', 'android-chromium-testshell', 'android-jb-system-chrome', 'android-chrome-canary', 'android-chrome', 'android-webview', 'android-content-shell', 'cros-chrome', ...]<br>
 <strong>BROWSER_FINDERS</strong> = [&lt;module 'telemetry.core.backends.chrome.desktop_...core/backends/chrome/desktop_browser_finder.pyc'&gt;, &lt;module 'telemetry.core.backends.chrome.android_...core/backends/chrome/android_browser_finder.pyc'&gt;, &lt;module 'telemetry.core.backends.chrome.cros_bro...ry/core/backends/chrome/cros_browser_finder.pyc'&gt;, &lt;module 'telemetry.core.backends.webdriver.webdr.../webdriver/webdriver_desktop_browser_finder.pyc'&gt;]</td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file

tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

@@ -30,6 +30,10 @@ CHROME_PACKAGE_NAMES = {
       ['org.chromium.chrome.shell',
        android_browser_backend.ChromeShellBackendSettings,
        'ChromeShell.apk'],
+  'android-chrome-shell':
+      ['org.chromium.chrome.shell',
+       android_browser_backend.ChromeShellBackendSettings,
+       'ChromeShell.apk'],
   'android-webview':
       ['com.android.webview.chromium.shell',
        android_browser_backend.WebviewBackendSettings,