Add AMP support to test runner.

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 6ccfb37ec95afb146d4fb57072b551440f617da4..4115f25be4d70b041bd1dec4e2134691f337a4d2 100644
--- a/build/android/pylib/base/test_run_factory.py
+++ b/build/android/pylib/base/test_run_factory.py
@@ -2,8 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-def CreateTestRun(_args, _env, _test_instance, error_func):
+from pylib.remote.device import remote_device_gtest_run
+from pylib.remote.device import remote_device_uirobot_run
 
+def CreateTestRun(options, env, test_instance, error_func):

[jbudorick, 2014/12/04 21:51:33]

rename options -> args

[rnephew (Reviews Here), 2014/12/04 23:16:50]

Done.

+  if (options.environment == 'remote_device'):

[jbudorick, 2014/12/04 21:51:33]

no parentheses around the if condition

[rnephew (Reviews Here), 2014/12/04 23:16:50]

Done.

+      if (test_instance.TestType() == 'gtest'):

[jbudorick, 2014/12/04 21:51:33]

same

[rnephew (Reviews Here), 2014/12/04 23:16:50]

Done.

+        return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance)
+      if (test_instance.TestType() == 'uirobot'):

[jbudorick, 2014/12/04 21:51:33]

same

[rnephew (Reviews Here), 2014/12/04 23:16:50]

Done.

+        return remote_device_uirobot_run.RemoteDeviceUirobotRun(
+            env,test_instance)
   # TODO(jbudorick) Add local gtest test runs
   # TODO(jbudorick) Add local instrumentation test runs.
   error_func('No test runs are currently supported.')

[jbudorick, 2014/12/04 21:51:33]

rephrase

[rnephew (Reviews Here), 2014/12/04 23:16:50]

Done.