[Android] Implement perf tests to platform mode.

build/android/pylib/base/test_run_factory.py

Index: build/android/pylib/base/test_run_factory.py
diff --git a/build/android/pylib/base/test_run_factory.py b/build/android/pylib/base/test_run_factory.py
index 8db9bd633b249c7a980e52e690a2d0db08221979..889525bfbeb7009ea7aa783d239447c31ef9f48b 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -7,6 +7,8 @@ from pylib.instrumentation import instrumentation_test_instance
 from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_gtest_run
 from pylib.local.device import local_device_instrumentation_test_run
+from pylib.local.device import local_device_perf_test_run
+from pylib.perf import perf_test_instance
 from pylib.uirobot import uirobot_test_instance
 
 try:
@@ -21,7 +23,18 @@ except ImportError:
   remote_device_uirobot_test_run = None
 
 

[rnephew (Reviews Here), 2016/06/30 19:10:36]

Moved perf test runs to its own class because pylint was angry.

************* Module pylib.base.test_run_factory
R: 26, 0: Too many return statements (8/6) (too-many-return-statements)

[jbudorick, 2016/07/01 14:20:10]

Hm, I thought we had that one disabled.

-def CreateTestRun(_args, env, test_instance, error_func):
+def CreatePerfTestRun(args, env, test_instance):

[jbudorick, 2016/07/01 14:20:10]

nit: _CreatePerfTestRun

[rnephew (Reviews Here), 2016/07/01 22:09:31]

Done.

+  if args.print_step:
+    return local_device_perf_test_run.LocalDevicePerfTestRunPrintStep(
+        env, test_instance)
+  elif args.output_json_list:
+    return local_device_perf_test_run.LocalDevicePerfTestRunOutputJsonList(
+        env, test_instance)
+  return local_device_perf_test_run.LocalDevicePerfTestRun(
+      env, test_instance)
+
+
+def CreateTestRun(args, env, test_instance, error_func):
   if isinstance(env, local_device_environment.LocalDeviceEnvironment):
     if isinstance(test_instance, gtest_test_instance.GtestTestInstance):
       return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance)
@@ -29,6 +42,9 @@ def CreateTestRun(_args, env, test_instance, error_func):
                   instrumentation_test_instance.InstrumentationTestInstance):
       return (local_device_instrumentation_test_run
               .LocalDeviceInstrumentationTestRun(env, test_instance))
+    if isinstance(test_instance,
+                  perf_test_instance.PerfTestInstance):
+      return CreatePerfTestRun(args, env, test_instance)
 
   if (remote_device_environment
       and isinstance(env, remote_device_environment.RemoteDeviceEnvironment)):