Add Instrumentation test support to remote device

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 argparse
 import collections
@@ skipping 124 matching lines @@
   group.add_argument('--results-path', default='',
                      help='File path to download results to.')
   group.add_argument('--api-protocol',
                      help='HTTP protocol to use. (http or https)')
   group.add_argument('--api-address', help='Address to send HTTP requests.')
   group.add_argument('--api-port', help='Port to send HTTP requests to.')
   group.add_argument('--runner-type', default='',
                      help='Type of test to run as.')
   group.add_argument('--runner-package', default='',
                      help='Package name of test.')
-  group.add_argument('--apk-under-test', default='apks/Chrome.apk',
+  group.add_argument('--app-under-test', default='',
                      help='APK to run tests on.')
 
   api_secret_group = group.add_mutually_exclusive_group()
   api_secret_group.add_argument('--api-secret', default='',
                                 help='API secret for remote devices.')
   api_secret_group.add_argument('--api-secret-file', default='',
                                 help='Path to file that contains API secret.')
 
   api_key_group = group.add_mutually_exclusive_group()
   api_key_group.add_argument('--api-key', default='',
@@ skipping 153 matching lines @@
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      help='.isolate file path to override the default '
                           'path')
 
   AddCommonOptions(parser)
   AddDeviceOptions(parser)
+  AddRemoteDeviceOptions(parser)
 
 
 def ProcessInstrumentationOptions(args):
   """Processes options/arguments and populate |options| with defaults.
 
   Args:
     args: argparse.Namespace object.
 
   Returns:
     An InstrumentationOptions named tuple which contains all options relevant to
@@ skipping 659 matching lines @@
     subparser = command_parsers.add_parser(
         test_type, usage='%(prog)s [options]', help=config.help_txt)
     config.add_options_func(subparser)
 
   args = parser.parse_args()
   return RunTestsCommand(args, parser)
 
 
 if __name__ == '__main__':
   sys.exit(main())