Changes argument passing to use options objects

build/android/pylib/gtest/setup.py

Index: build/android/pylib/gtest/setup.py
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index a7271e587b681e33a5189cad3bd2b0efcf88d90a..a1a2bbc2fcdad1409bb0605f300cc3a4385d17ba 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -257,25 +257,21 @@ def _GetTestsFiltered(suite_name, gtest_filter, runner_factory, devices):
   return tests
 
 
-def Setup(suite_name, test_arguments, timeout,
-          cleanup_test_files, tool, build_type, push_deps,
-          gtest_filter):
+def Setup(test_options):
   """Create the test runner factory and tests.
 
   Args:
-    suite_name: The suite name specified on the command line.
-    test_arguments: Additional arguments to pass to the test binary.
-    timeout: Timeout for each test.
-    cleanup_test_files: Whether or not to cleanup test files on device.
-    tool: Name of the Valgrind tool.
-    build_type: 'Release' or 'Debug'.
-    push_deps: If True, push all dependencies to the device.
-    gtest_filter: Filter for tests.
+    test_options: A GTestOptions object containing all options relevant to
+        running gtests.
 
   Returns:
     A tuple of (TestRunnerFactory, tests).
   """
 
+  suite_name = test_options.suite_name
+  build_type = test_options.build_type
+  gtest_filter = test_options.gtest_filter
+
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
@@ -293,14 +289,9 @@ def Setup(suite_name, test_arguments, timeout,
   # Constructs a new TestRunner with the current options.
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
+        test_options,
         device,
-        test_package,
-        test_arguments,
-        timeout,
-        cleanup_test_files,
-        tool,
-        build_type,
-        push_deps)
+        test_package)
 
   attached_devices = android_commands.GetAttachedDevices()
   tests = _GetTestsFiltered(suite_name, gtest_filter,