[Android] Fix --test-arguments.

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 logging
 import os
 import re
 import sys
 import tempfile
 
@@ skipping 180 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
+
+  @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'
 
   #override
   def SetUp(self):
     """Map data dependencies via isolate."""
     if self._isolate_delegate:
       self._isolate_delegate.Remap(
           self._isolate_abs_path, self._isolated_abs_path)
@@ skipping 92 matching lines @@
         result_type = None
 
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     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
-