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

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

 # Copyright 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.
 
 """Finds android browsers that can be controlled by telemetry."""
 
 import os
 import logging as real_logging
 import re
 import subprocess
 import sys
 
 from telemetry import decorators
 from telemetry.core import browser
 from telemetry.core import possible_browser
 from telemetry.core import util
 from telemetry.core.backends import adb_commands
 from telemetry.core.backends.chrome import android_browser_backend
 from telemetry.core.platform import android_platform_backend
 
 
 CHROME_PACKAGE_NAMES = {
   'android-content-shell':
       ['org.chromium.content_shell_apk',
        android_browser_backend.ContentShellBackendSettings,
        'ContentShell.apk'],
-  # TODO(tonyg): rename android-chromium-testshell to android-chrome-shell

[tonyg, 2014/06/02 15:20:43]

I guess we should keep a TODO here to remove this entry.

   'android-chromium-testshell':
       ['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,
        None],
   'android-chrome':
       ['com.google.android.apps.chrome',
        android_browser_backend.ChromeBackendSettings,
        'Chrome.apk'],
   'android-chrome-beta':
       ['com.chrome.beta',
@@ skipping 201 matching lines @@
   if possible_browsers:
     installed_prebuilt_tools = adb_commands.SetupPrebuiltTools(adb)
     if not installed_prebuilt_tools:
       logging.error(
           'Android device detected, however prebuilt android tools could not '
           'be used. To run on Android you must build them first:\n'
           '  $ ninja -C out/Release android_tools')
       return []
 
   return possible_browsers