[android] Add support for passing command-line flags directly.

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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.
 
 import collections
 import copy
 import json
 import logging
 import os
 import pickle
@@ skipping 624 matching lines @@
       self._excluded_annotations = []
 
     requested_annotations = set(a[0] for a in self._annotations)
     if not args.run_disabled:
       self._excluded_annotations.extend(
           annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
           if a not in requested_annotations)
 
   def _initializeFlagAttributes(self, args):
     self._flags = ['--enable-test-intents']
-    # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file"
-    if hasattr(args, 'device_flags') and args.device_flags:
-      with open(args.device_flags) as device_flags_file:
-        stripped_lines = (l.strip() for l in device_flags_file)
-        self._flags.extend([flag for flag in stripped_lines if flag])
-    if hasattr(args, 'device_flags_file') and args.device_flags_file:
+    if args.command_line_flags:
+      self._flags.extend(args.command_line_flags)
+    if args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
-        self._flags.extend([flag for flag in stripped_lines if flag])
-    if (hasattr(args, 'strict_mode') and
-        args.strict_mode and
-        args.strict_mode != 'off'):
+        self._flags.extend(flag for flag in stripped_lines if flag)
+    if args.strict_mode and args.strict_mode != 'off':
       self._flags.append('--strict-mode=' + args.strict_mode)
-    if hasattr(args, 'regenerate_goldens') and args.regenerate_goldens:
+    if args.regenerate_goldens:
       self._flags.append('--regenerate-goldens')
 
+    if args.test_arguments:
+      # --test-arguments is deprecated for gtests and is in the process of
+      # being removed.
+      raise Exception(
+          '--test-arguments is not supported for instrumentation '
+          'tests. Pass command-line flags directly instead.')
+
   def _initializeDriverAttributes(self):
     self._driver_apk = os.path.join(
         constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
         'OnDeviceInstrumentationDriver.apk')
     if os.path.exists(self._driver_apk):
       driver_apk = apk_helper.ApkHelper(self._driver_apk)
       self._driver_package = driver_apk.GetPackageName()
       self._driver_name = driver_apk.GetInstrumentationName()
     else:
       self._driver_apk = None
@@ skipping 209 matching lines @@
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     pass