[chromedriver] Run tests on stable and beta channel chrome.

chrome/test/chromedriver/test/run_all_tests.py

Index: chrome/test/chromedriver/test/run_all_tests.py
diff --git a/chrome/test/chromedriver/test/run_all_tests.py b/chrome/test/chromedriver/test/run_all_tests.py
index 7236c86b83543c410c2ab98d9ca8856cd4389cf8..92b7f5d01d1af08e99199666c44206a86c8b2b9f 100755
--- a/chrome/test/chromedriver/test/run_all_tests.py
+++ b/chrome/test/chromedriver/test/run_all_tests.py
@@ -65,7 +65,7 @@ def RunPythonTests(chromedriver, ref_chromedriver,
                    chrome_version_name=None, android_package=None):
   version_info = ''
   if chrome_version_name:
-    version_info = '(v%s)' % chrome_version_name
+    version_info = '(%s)' % chrome_version_name
   util.MarkBuildStepStart('python_tests%s' % version_info)
   code = util.RunCommand(
       _GenerateTestCommand('run_py_tests.py',
@@ -83,7 +83,7 @@ def RunJavaTests(chromedriver, chrome=None, chrome_version=None,
                  chrome_version_name=None, android_package=None):
   version_info = ''
   if chrome_version_name:
-    version_info = '(v%s)' % chrome_version_name
+    version_info = '(%s)' % chrome_version_name
   util.MarkBuildStepStart('java_tests%s' % version_info)
   code = util.RunCommand(
       _GenerateTestCommand('run_java_tests.py',
@@ -115,6 +115,9 @@ def main():
   parser.add_option(
       '', '--android-package',
       help='Application package name, if running tests on Android.')
+  parser.add_option(
+      '', '--android', action='store_true', default=False,
+      help='Run tests on stable and beta channel on Android.')
   # Option 'chrome-version' is for desktop only.
   parser.add_option(
       '', '--chrome-version',
@@ -153,15 +156,26 @@ def main():
     # For Windows bots: add ant, java(jre) and the like to system path.
     _AddToolsToSystemPathForWindows()
 
-  if options.android_package:
+  if options.android_package or options.android:
     os.environ['PATH'] += os.pathsep + os.path.join(
         _THIS_DIR, os.pardir, 'chrome')
-    code1 = RunPythonTests(chromedriver,
-                           ref_chromedriver,
-                           android_package=options.android_package)
-    code2 = RunJavaTests(chromedriver,
-                         android_package=options.android_package)
-    return code1 or code2
+    android_packages = []
+    if options.android_package:
+      android_packages.append(options.android_package)
+    if options.android:
+      android_packages.append('com.android.chrome')
+      android_packages.append('com.chrome.beta')
+    code = 0
+    for package in android_packages:
+      code1 = RunPythonTests(chromedriver,
+                             ref_chromedriver,
+                             chrome_version_name=package,
+                             android_package=package)
+      code2 = RunJavaTests(chromedriver,
+                          chrome_version_name=package,
+                           android_package=package)
+      code = code or code1 or code2
+    return code
   else:
     latest_snapshot_revision = archive.GetLatestRevision(archive.Site.SNAPSHOT)
     versions = [
@@ -184,10 +198,10 @@ def main():
                              ref_chromedriver,
                              chrome=chrome_path,
                              chrome_version=version[0],
-                             chrome_version_name=version_name)
+                             chrome_version_name='v%s' % version_name)
       code2 = RunJavaTests(chromedriver, chrome=chrome_path,
                            chrome_version=version[0],
-                           chrome_version_name=version_name)
+                           chrome_version_name='v%s' % version_name)
       code = code or code1 or code2
     cpp_tests = os.path.join(build_dir, cpp_tests_name)
     return RunCppTests(cpp_tests) or code