Telemetry: adds support for chromium test shell.

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

Index: tools/telemetry/telemetry/core/chrome/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
index aba633a9ba39d6ba7c9221477120f343467f54ae..f6a0c0e3e00263b08d98aebc6420ee06f672ecec 100644
--- a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
@@ -22,10 +22,14 @@ CHROME_PACKAGE_NAMES = {
   'android-jb-system-chrome': 'com.android.chrome'
 }
 
-ALL_BROWSER_TYPES = ','.join(['android-content-shell', 'android-webview'] +
-                             CHROME_PACKAGE_NAMES.keys())
+ALL_BROWSER_TYPES = ','.join([
+                                'android-chromium-testshell',
+                                'android-content-shell',
+                                'android-webview',
+                             ] + CHROME_PACKAGE_NAMES.keys())
 
 CONTENT_SHELL_PACKAGE = 'org.chromium.content_shell_apk'
+CHROMIUM_TESTSHELL_PACKAGE = 'org.chromium.chrome.testshell'
 WEBVIEW_PACKAGE = 'com.android.webview.chromium.shell'
 
 
@@ -118,6 +122,13 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
             adb, CONTENT_SHELL_PACKAGE))
     possible_browsers.append(b)
 
+  if 'package:' + CHROMIUM_TESTSHELL_PACKAGE in packages:
+    b = PossibleAndroidBrowser(
+        'android-chromium-testshell',
+        options, android_browser_backend.ChromiumTestShellBackendSettings(
+            adb, CHROMIUM_TESTSHELL_PACKAGE))
+    possible_browsers.append(b)
+
   if 'package:' + WEBVIEW_PACKAGE in packages:
     b = PossibleAndroidBrowser(
         'android-webview',