[Android] Launch chrome using an intent before running uiautomator tests.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs all types of tests from one unified interface."""
 
 import collections
 import logging
@@ skipping 280 matching lines @@
       options.test_apk_jar_path)
 
 
 def AddUIAutomatorTestOptions(option_parser):
   """Adds UI Automator test options to |option_parser|."""
 
   option_parser.usage = '%prog uiautomator [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
       '%prog uiautomator --test-jar=chromium_testshell_uiautomator_tests'
-      ' --package-name=org.chromium.chrome.testshell')
+      ' --package=chromium_test_shell')
   option_parser.add_option(
-      '--package-name',
-      help='The package name used by the apk containing the application.')
+      '--package',
+      help=('Package under test. Possible values: %s' %
+            constants.PACKAGE_INFO.keys()))
   option_parser.add_option(
       '--test-jar', dest='test_jar',
       help=('The name of the dexed jar containing the tests (without the '
             '.dex.jar extension). Alternatively, this can be a full path '
             'to the jar.'))
 
   AddJavaTestOptions(option_parser)
   AddCommonOptions(option_parser)
 
 
 def ProcessUIAutomatorOptions(options, error_func):
   """Processes UIAutomator options/arguments.
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
     A UIAutomatorOptions named tuple which contains all options relevant to
     uiautomator tests.
   """
 
   ProcessJavaTestOptions(options, error_func)
 
-  if not options.package_name:
-    error_func('--package-name must be specified.')
+  if not options.package:
+    error_func('--package is required.')
+
+  if options.package not in constants.PACKAGE_INFO:
+    error_func('Invalid package.')
 
   if not options.test_jar:
     error_func('--test-jar must be specified.')
 
   if os.path.exists(options.test_jar):
     # The dexed JAR is fully qualified, assume the info JAR lives along side.
     options.uiautomator_jar = options.test_jar
   else:
     options.uiautomator_jar = os.path.join(
         constants.GetOutDirectory(),
         constants.SDK_BUILD_JAVALIB_DIR,
         '%s.dex.jar' % options.test_jar)
   options.uiautomator_info_jar = (
       options.uiautomator_jar[:options.uiautomator_jar.find('.dex.jar')] +
       '_java.jar')
 
   return uiautomator_test_options.UIAutomatorOptions(
       options.tool,
       options.cleanup_test_files,
       options.push_deps,
       options.annotations,
       options.exclude_annotations,
       options.test_filter,
       options.test_data,
       options.save_perf_json,
       options.screenshot_failures,
       options.uiautomator_jar,
       options.uiautomator_info_jar,
-      options.package_name)
+      options.package)
 
 
 def AddMonkeyTestOptions(option_parser):
   """Adds monkey test options to |option_parser|."""
 
   option_parser.usage = '%prog monkey [options]'
   option_parser.commands_dict = {}
   option_parser.example = (
-      '%prog monkey --package-name=org.chromium.content_shell_apk'
-      ' --activity-name=.ContentShellActivity')
+      '%prog monkey --package=chromium_test_shell')
 
-  option_parser.add_option('--package-name', help='Allowed package.')
   option_parser.add_option(
-      '--activity-name', help='Name of the activity to start.')
+      '--package',
+      help=('Package under test. Possible values: %s' %
+            constants.PACKAGE_INFO.keys()))
   option_parser.add_option(
       '--event-count', default=10000, type='int',
       help='Number of events to generate [default: %default].')
   option_parser.add_option(
       '--category', default='',
       help='A list of allowed categories.')
   option_parser.add_option(
       '--throttle', default=100, type='int',
       help='Delay between events (ms) [default: %default]. ')
   option_parser.add_option(
@@ skipping 12 matching lines @@
   """Processes all monkey test options.
 
   Args:
     options: optparse.Options object.
     error_func: Function to call with the error message in case of an error.
 
   Returns:
     A MonkeyOptions named tuple which contains all options relevant to
     monkey tests.
   """
-  if not options.package_name:
-    error_func('Package name is required.')
+  if not options.package:
+    error_func('--package is required.')
+
+  if options.package not in constants.PACKAGE_INFO:
+    error_func('Invalid package.')
 
   category = options.category
   if category:
     category = options.category.split(',')
 
   return monkey_test_options.MonkeyOptions(
       options.verbose_count,
-      options.package_name,
-      options.activity_name,
+      options.package,
       options.event_count,
       category,
       options.throttle,
       options.seed,
       options.extra_args)
 
 
 def AddPerfTestOptions(option_parser):
   """Adds perf test options to |option_parser|."""
 
@@ skipping 332 matching lines @@
 
 
 def main(argv):
   option_parser = command_option_parser.CommandOptionParser(
       commands_dict=VALID_COMMANDS)
   return command_option_parser.ParseAndExecute(option_parser)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))