[Android] Fix --test-arguments.

BUG=libyuv:507

Review URL: https://codereview.chromium.org/1416763003

Cr-Commit-Position: refs/heads/master@{#355054}

3 files changed, 66 insertions, 50 deletions

diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index 626e120..e82e625 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -198,10 +198,64 @@ class GtestTestInstance(test_instance.TestInstance):
       self._app_data_files = None
       self._app_data_file_dir = None
 
+    self._test_arguments = args.test_arguments
+
+  @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):
+    return self._apk_helper
+
+  @property
+  def app_file_dir(self):
+    return self._app_data_file_dir
+
+  @property
+  def app_files(self):
+    return self._app_data_files
+
+  @property
+  def exe(self):
+    return self._exe_path
+
+  @property
+  def extras(self):
+    return self._extras
+
   @property
   def gtest_filter(self):
     return self._gtest_filter
 
+  @property
+  def package(self):
+    return self._apk_helper and self._apk_helper.GetPackageName()
+
+  @property
+  def permissions(self):
+    return self._apk_helper and self._apk_helper.GetPermissions()
+
+  @property
+  def runner(self):
+    return self._apk_helper and self._apk_helper.GetInstrumentationName()
+
+  @property
+  def shard_timeout(self):
+    return self._shard_timeout
+
+  @property
+  def suite(self):
+    return self._suite
+
+  @property
+  def test_arguments(self):
+    return self._test_arguments
+
   #override
   def TestType(self):
     return 'gtest'
@@ -314,51 +368,3 @@ class GtestTestInstance(test_instance.TestInstance):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()
 
-  @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):
-    return self._apk_helper
-
-  @property
-  def app_file_dir(self):
-    return self._app_data_file_dir
-
-  @property
-  def app_files(self):
-    return self._app_data_files
-
-  @property
-  def exe(self):
-    return self._exe_path
-
-  @property
-  def extras(self):
-    return self._extras
-
-  @property
-  def package(self):
-    return self._apk_helper and self._apk_helper.GetPackageName()
-
-  @property
-  def permissions(self):
-    return self._apk_helper and self._apk_helper.GetPermissions()
-
-  @property
-  def runner(self):
-    return self._apk_helper and self._apk_helper.GetInstrumentationName()
-
-  @property
-  def shard_timeout(self):
-    return self._shard_timeout
-
-  @property
-  def suite(self):
-    return self._suite
-
diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py
index caef054..c928ecb 100644
--- a/build/android/pylib/local/device/local_device_gtest_run.py
+++ b/build/android/pylib/local/device/local_device_gtest_run.py
@@ -300,7 +300,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
     timeout = (self._test_instance.shard_timeout
                * self.GetTool(device).GetTimeoutScale())
     output = self._delegate.Run(
-        test, device, timeout=timeout, retries=0)
+        test, device, flags=self._test_instance.test_arguments,
+        timeout=timeout, retries=0)
     for s in self._servers[str(device)]:
       s.Reset()
     if self._test_instance.app_files:
diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py
index 33850f8..0cfe717 100644
--- a/build/android/pylib/remote/device/remote_device_gtest_run.py
+++ b/build/android/pylib/remote/device/remote_device_gtest_run.py
@@ -53,9 +53,18 @@ class RemoteDeviceGtestTestRun(remote_device_test_run.RemoteDeviceTestRun):
       if gtest_test_instance.EXTRA_SHARD_NANO_TIMEOUT not in env_vars:
         env_vars[gtest_test_instance.EXTRA_SHARD_NANO_TIMEOUT] = int(
             self._test_instance.shard_timeout * 1e9)
+
+      flags = []
+
       filter_string = self._test_instance._GenerateDisabledFilterString(None)
       if filter_string:
-        flag_file.write('_ --gtest_filter=%s' % filter_string)
+        flags.append('--gtest_filter=%s' % filter_string)
+
+      if self._test_instance.test_arguments:
+        flags.append(self._test_instance.test_arguments)
+
+      if flags:
+        flag_file.write('_ ' + ' '.join(flags))
         flag_file.flush()
         env_vars[_EXTRA_COMMAND_LINE_FILE] = os.path.basename(flag_file.name)
         self._test_instance._data_deps.append(