[Android] Fix the uiautomator test runner's use of InstrumentationOptions.

BUG=398520

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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@287217 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/instrumentation/test_options.py

@@ -14,7 +14,6 @@ InstrumentationOptions = collections.namedtuple('InstrumentationOptions', [
     'exclude_annotations',
     'test_filter',
     'test_data',
-    'test_runner',
     'save_perf_json',
     'screenshot_failures',
     'wait_for_debugger',
@@ -22,4 +21,5 @@ InstrumentationOptions = collections.namedtuple('InstrumentationOptions', [
     'test_apk',
     'test_apk_path',
     'test_apk_jar_path',
+    'test_runner',
     'test_support_apk_path'])

android/pylib/uiautomator/test_runner.py

@@ -39,6 +39,7 @@ class TestRunner(instr_test_runner.TestRunner):
         test_apk=None,
         test_apk_path=None,
         test_apk_jar_path=None,
+        test_runner=None,
         test_support_apk_path=None)
     super(TestRunner, self).__init__(instrumentation_options, device,
                                      shard_index, test_pkg)

android/test_runner.py

@@ -291,7 +291,6 @@ def ProcessInstrumentationOptions(options, error_func):
       options.exclude_annotations,
       options.test_filter,
       options.test_data,
-      options.test_runner,
       options.save_perf_json,
       options.screenshot_failures,
       options.wait_for_debugger,
@@ -299,6 +298,7 @@ def ProcessInstrumentationOptions(options, error_func):
       options.test_apk,
       options.test_apk_path,
       options.test_apk_jar_path,
+      options.test_runner,
       options.test_support_apk_path
       )