[android] Add support for providing flags to instrumentation tests directly.

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 348 matching lines @@
                      type=os.path.realpath,
                      help='Path to install script for the --test-apk.')
   group.add_argument('--additional-apk', action='append',
                      dest='additional_apks', default=[],
                      type=os.path.realpath,
                      help='Additional apk that must be installed on '
                           'the device when the tests are run')
   group.add_argument('--coverage-dir', type=os.path.realpath,
                      help=('Directory in which to place all generated '
                            'EMMA coverage files.'))
-  group.add_argument('--device-flags', dest='device_flags',
+  group.add_argument('--device-flags',
+                     '--test-arguments',

[mikecase (-- gone --), 2017/03/10 18:08:03]

Why are we adding another alias for this?

also, --command-line-flags seems like a better name for this arg over
--device-flags and --test-arguments.

[jbudorick, 2017/03/10 18:11:17]

--test-arguments is what it is for gtests, hence the alias. I suppose
--command-line-flags/--command-line-flags-file would be a more sensible end
state, though.

[jam, 2017/03/10 19:20:58]

As a non-Android developer, having to specify command lines differently is
confusing.

[jbudorick, 2017/03/10 19:38:44]

hmm, we might be able to pass arguments that the test runner doesn't recognize
on to the device, though I'd consider that change to be a bit more risky. It'd
conceivably let you do

  "args": [
    "--enable-browser-side-navigation",
  ],

in the JSON.

+                     dest='device_flags',
                      type=os.path.realpath,
-                     help='The relative filepath to a file containing '
-                          'command-line flags to set on the device')
+                     help='Command-line flags to set on the device')

[shenghuazhang, 2017/03/10 19:04:57]

Since this is matching the argument in gtest, and the help comment for gtest is:
    help='Additional arguments to pass to the test.'

which is different with it. Wonder if it can be unified s.t. knowing the support
has the same meaning as gtest explicitly.

   group.add_argument('--device-flags-file', type=os.path.realpath,
                      help='The relative filepath to a file containing '
                           'command-line flags to set on the device')
   # TODO(jbudorick): Remove this after ensuring nothing else uses it.
   group.add_argument('--isolate_file_path',
                      '--isolate-file-path',
                      dest='isolate_file_path',
                      type=os.path.realpath,
                      help=argparse.SUPPRESS)
   group.add_argument('--runtime-deps-path',
@@ skipping 470 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())