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

tools/telemetry/telemetry/android_browser_finder.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.
 """Finds android browsers that can be controlled by telemetry."""
 
 import os
 import logging as real_logging
 import re
 import subprocess
 
 from telemetry import adb_commands
 from telemetry import android_browser_backend
 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_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'
+}
 
-CHROME_PACKAGE = 'com.google.android.apps.chrome'
-CHROME_ACTIVITY = '.Main'
+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'
 CONTENT_SHELL_DEVTOOLS_REMOTE_PORT = (
     'localabstract:content_shell_devtools_remote')
 
 # adb shell pm list packages
 # adb
 # intents to run (pass -D url for the rest)
 #   com.android.chrome/.Main
@@ skipping 72 matching lines @@
   possible_browsers = []
   if 'package:' + CONTENT_SHELL_PACKAGE in packages:
     b = PossibleAndroidBrowser('android-content-shell',
                                options, adb,
                                CONTENT_SHELL_PACKAGE, True,
                                CONTENT_SHELL_COMMAND_LINE,
                                CONTENT_SHELL_ACTIVITY,
                                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.
   if len(possible_browsers) and not adb_commands.HasForwarder():
     logging.warn('telemetry detected an android device. However,')
     logging.warn('Chrome\'s port-forwarder app is not available.')
     logging.warn('To build:')
     logging.warn('  make -j16 host_forwarder device_forwarder')
     logging.warn('')
     logging.warn('')
     return []
   return possible_browsers