[Android] Converts host driven tests to common test_dispatcher

build/android/test_runner.py

Index: build/android/test_runner.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index f89fdb9263bc9008ac61a6e3325e765b8c90bfe5..4ad7293e08f7c47e6ef6d1c5421fb4e13ee58b34 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -24,7 +24,7 @@ from pylib.base import test_dispatcher
 from pylib.browsertests import setup as browsertests_setup
 from pylib.gtest import setup as gtest_setup
 from pylib.gtest import gtest_config
-from pylib.host_driven import run_python_tests as python_dispatch
+from pylib.host_driven import setup as host_driven_setup
 from pylib.instrumentation import setup as instrumentation_setup
 from pylib.uiautomator import setup as uiautomator_setup
 from pylib.utils import report_results
@@ -444,8 +444,22 @@ def _RunInstrumentationTests(options, error_func):
     results.AddTestRunResults(test_results)
 
   if options.run_python_tests:
-    test_results, test_exit_code = (
-        python_dispatch.DispatchPythonTests(options))
+    runner_factory, tests = host_driven_setup.InstrumentationSetup(
+        options.python_test_root, options.official_build, options.annotations,
+        options.exclude_annotations, options.test_filter, options.tool,
+        options.build_type, options.push_deps, options.cleanup_test_files,
+        options.test_apk_path, options.test_apk_jar_path, options.test_data,
+        options.install_apk, options.save_perf_json,
+        options.screenshot_failures, options.wait_for_debugger,
+        options.disable_assertions)
+
+    test_results, test_exit_code = test_dispatcher.RunTests(
+        tests, runner_factory, False,
+        options.test_device,
+        shard=True,
+        build_type=options.build_type,
+        test_timeout=None,
+        num_retries=options.num_retries)
 
     results.AddTestRunResults(test_results)
 
@@ -490,8 +504,23 @@ def _RunUIAutomatorTests(options, error_func):
     results.AddTestRunResults(test_results)
 
   if options.run_python_tests:
-    test_results, test_exit_code = (
-        python_dispatch.DispatchPythonTests(options))
+    # TODO(gkanwar): Create a UIAutomator Setup, use it here
+    runner_factory, tests = host_driven_setup.InstrumentationSetup(
+        options.python_test_root, options.official_build, options.annotations,
+        options.exclude_annotations, options.test_filter, options.tool,
+        options.build_type, options.push_deps, options.cleanup_test_files,
+        options.test_apk_path, options.test_apk_jar_path, options.test_data,
+        options.install_apk, options.save_perf_json,
+        options.screenshot_failures, options.wait_for_debugger,
+        options.disable_assertion)
+
+    test_results, test_exit_code = test_dispatcher.RunTests(
+        tests, runner_factory, False,
+        options.test_device,
+        shard=True,
+        build_type=options.build_type,
+        test_timeout=None,
+        num_retries=options.num_retries)
 
     results.AddTestRunResults(test_results)