[Android] Implement instrumentation tests in platform mode.

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 275 matching lines @@
   java_or_python_group.add_argument(
       '-p', '--python-only', action='store_false',
       dest='run_java_tests', default=True,
       help='Run only the host-driven tests.')
 
   group.add_argument('--host-driven-root',
                      help='Root of the host-driven tests.')
   group.add_argument('-w', '--wait_debugger', dest='wait_for_debugger',
                      action='store_true',
                      help='Wait for debugger.')
+  group.add_argument('--apk-under-test', dest='apk_under_test',
+                     help=('the name of the apk under test.'))
   group.add_argument('--test-apk', dest='test_apk', required=True,
                      help=('The name of the apk containing the tests '
                            '(without the .apk extension; '
                            'e.g. "ContentShellTest").'))
   group.add_argument('--coverage-dir',
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
   group.add_argument('--device-flags', dest='device_flags', default='',
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
+  group.add_argument('--device-flags-file', default='',
+                     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)
 
 
@@ skipping 575 matching lines @@
   elif command == 'perf':
     return _RunPerfTests(args)
   elif command == 'python':
     return _RunPythonTests(args)
   else:
     raise Exception('Unknown test type.')
 
 
 _SUPPORTED_IN_PLATFORM_MODE = [
   # TODO(jbudorick): Add support for more test types.
-  'gtest', 'uirobot',
+  'gtest',
+  'instrumentation',
+  'uirobot',
 ]
 
 
 def RunTestsInPlatformMode(args, parser):
 
   if args.command not in _SUPPORTED_IN_PLATFORM_MODE:
     parser.error('%s is not yet supported in platform mode' % args.command)
 
   with environment_factory.CreateEnvironment(args, parser.error) as env:
     with test_instance_factory.CreateTestInstance(args, parser.error) as test:
       with test_run_factory.CreateTestRun(
           args, env, test, parser.error) as test_run:
         results = test_run.RunTests()
 
-        if args.trigger:
+        if args.environment == 'remote_device' and args.trigger:
           return 0 # Not returning results, only triggering.
 
         report_results.LogFull(
             results=results,
             test_type=test.TestType(),
             test_package=test_run.TestPackage(),
             annotation=getattr(args, 'annotations', None),
             flakiness_server=getattr(args, 'flakiness_dashboard_server', None))
 
         if args.json_results_file:
@@ skipping 54 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())