[Telemetry] Teach telemetry to recognize beta and dev chrome on android.

tools/telemetry/telemetry/android_browser_finder.py

Index: tools/telemetry/telemetry/android_browser_finder.py
diff --git a/tools/telemetry/telemetry/android_browser_finder.py b/tools/telemetry/telemetry/android_browser_finder.py
index 01e28e010c0075b78cdd73154f517670352e1e73..aa66d28046b67c42437a42292990439b23a9a5d9 100644
--- a/tools/telemetry/telemetry/android_browser_finder.py
+++ b/tools/telemetry/telemetry/android_browser_finder.py
@@ -14,20 +14,20 @@ from telemetry import android_platform
 from telemetry import browser
 from telemetry import possible_browser
 
-ALL_BROWSER_TYPES = ','.join([
-    'android-content-shell',
-    'android-chrome',
-    'android-jb-system-chrome',
-    ])
-
-CHROME_PACKAGE = 'com.google.android.apps.chrome'
-CHROME_ACTIVITY = '.Main'
+CHROME_PACKAGE_NAMES = {
+  'android-chrome': 'com.google.android.apps.chrome',
+  'android-chrome-beta': 'com.chrome.beta',
+  'android-chrome-dev': 'com.google.android.apps.chrome_dev',
+  'android-jb-system-chrome': 'com.android.chrome'
+}
+
+ALL_BROWSER_TYPES = ','.join(['android-content-shell'] +
+                             CHROME_PACKAGE_NAMES.keys())
+
+CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'

[nduca, 2013/01/04 19:47:08]

just out of curiosity, do we have code somewhere that somehow makes sure this
activity is sent to the right app when a device has both chrome and chrome-beta?

 CHROME_COMMAND_LINE = '/data/local/chrome-command-line'
 CHROME_DEVTOOLS_REMOTE_PORT = 'localabstract:chrome_devtools_remote'
 
-CHROME_JB_SYSTEM_PACKAGE = 'com.android.chrome'
-CHROME_JB_SYSTEM_DEVTOOLS_REMOTE_PORT = 'localabstract:chrome_devtools_remote'
-
 CONTENT_SHELL_PACKAGE = 'org.chromium.content_shell'
 CONTENT_SHELL_ACTIVITY = '.ContentShellActivity'
 CONTENT_SHELL_COMMAND_LINE = '/data/local/tmp/content-shell-command-line'
@@ -120,23 +120,15 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
                                CONTENT_SHELL_DEVTOOLS_REMOTE_PORT)
     possible_browsers.append(b)
 
-  if 'package:' + CHROME_PACKAGE in packages:
-    b = PossibleAndroidBrowser('android-chrome',
-                               options, adb,
-                               CHROME_PACKAGE, False,
-                               CHROME_COMMAND_LINE,
-                               CHROME_ACTIVITY,
-                               CHROME_DEVTOOLS_REMOTE_PORT)
-    possible_browsers.append(b)
-
-  if 'package:' + CHROME_JB_SYSTEM_PACKAGE in packages:
-    b = PossibleAndroidBrowser('android-jb-system-chrome',
-                               options, adb,
-                               CHROME_JB_SYSTEM_PACKAGE, False,
-                               CHROME_COMMAND_LINE,
-                               CHROME_ACTIVITY,
-                               CHROME_JB_SYSTEM_DEVTOOLS_REMOTE_PORT)
-    possible_browsers.append(b)
+  for name, package in CHROME_PACKAGE_NAMES.iteritems():
+    if 'package:' + package in packages:
+      b = PossibleAndroidBrowser(name,
+                                 options, adb,
+                                 package, False,
+                                 CHROME_COMMAND_LINE,
+                                 CHROME_ACTIVITY,
+                                 CHROME_DEVTOOLS_REMOTE_PORT)
+      possible_browsers.append(b)
 
   # See if the "forwarder" is installed -- we need this to host content locally
   # but make it accessible to the device.