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

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 HTMLParser
 import logging
 import os
 import re
 import tempfile
 import threading
@@ skipping 316 matching lines @@
       self._app_data_files = args.app_data_files
       if args.app_data_file_dir:
         self._app_data_file_dir = args.app_data_file_dir
       else:
         self._app_data_file_dir = tempfile.mkdtemp()
         logging.critical('Saving app files to %s', self._app_data_file_dir)
     else:
       self._app_data_files = None
       self._app_data_file_dir = None
 
-    self._test_arguments = args.test_arguments
+    self._flags = None
+    self._initializeCommandLineFlags(args)
 
     # TODO(jbudorick): Remove this once it's deployed.
     self._enable_xml_result_parsing = args.enable_xml_result_parsing
 
+  def _initializeCommandLineFlags(self, args):
+    self._flags = []
+    if args.command_line_flags:
+      self._flags.extend(args.command_line_flags)
+    if args.device_flags_file:
+      with open(args.device_flags_file) as f:
+        stripped_lines = (l.strip() for l in f)
+        self._flags.extend(flag for flag in stripped_lines if flag)
+    if args.run_disabled:
+      self._flags.append('--gtest_also_run_disabled_tests')
+    if args.test_arguments:
+      self._flags.extend(args.test_arguments.split())
+
   @property
   def activity(self):
     return self._apk_helper and self._apk_helper.GetActivityName()
 
   @property
   def apk(self):
     return self._apk_helper and self._apk_helper.path
 
   @property
   def apk_helper(self):
@@ skipping 21 matching lines @@
 
   @property
   def extract_test_list_from_filter(self):
     return self._extract_test_list_from_filter
 
   @property
   def extras(self):
     return self._extras
 
   @property
-  def gtest_also_run_disabled_tests(self):
-    return self._run_disabled
+  def flags(self):
+    return self._flags
 
   @property
   def gtest_filter(self):
     return self._gtest_filter
 
   @property
   def package(self):
     return self._apk_helper and self._apk_helper.GetPackageName()
 
   @property
@@ skipping 14 matching lines @@
 
   @property
   def suite(self):
     return self._suite
 
   @property
   def test_apk_incremental_install_script(self):
     return self._test_apk_incremental_install_script
 
   @property
-  def test_arguments(self):
-    return self._test_arguments
-
-  @property
   def total_external_shards(self):
     return self._total_external_shards
 
   #override
   def TestType(self):
     return 'gtest'
 
   #override
   def SetUp(self):
     """Map data dependencies via isolate."""
@@ skipping 62 matching lines @@
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
     """Do nothing."""
     pass