[Android] Split uiautomator test runner from instrumentation.

build/android/pylib/uiautomator/test_runner.py

Index: build/android/pylib/uiautomator/test_runner.py
diff --git a/build/android/pylib/uiautomator/test_runner.py b/build/android/pylib/uiautomator/test_runner.py
new file mode 100644
index 0000000000000000000000000000000000000000..5c59e25beefb9030be7abe3c248afd49e421afab
--- /dev/null
+++ b/build/android/pylib/uiautomator/test_runner.py
@@ -0,0 +1,40 @@
+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Class for running uiautomator tests on a single device."""
+
+from pylib.instrumentation import test_runner as instr_test_runner
+
+
+class TestRunner(instr_test_runner.TestRunner):
+  """Responsible for running a series of tests connected to a single device."""
+
+  def __init__(self, options, device, shard_index, test_pkg, ports_to_forward):
+    """Create a new TestRunner.
+
+    Args:
+      options: An options object similar to the one in parent class plus:
+        - package_name: Application package name under test.
+    """
+    options.ensure_value('install_apk', True)
+    options.ensure_value('wait_for_debugger', False)
+    super(TestRunner, self).__init__(
+        options, device, shard_index, test_pkg, ports_to_forward)
+
+    self.package_name = options.package_name
+
+  #override.

[craigdh, 2013/04/12 17:32:14]

no .

[frankf, 2013/04/12 18:00:13]

Done.

+  def PushDependencies(self):
+      self.test_pkg.Install(self.adb)
+
+  #override.

[craigdh, 2013/04/12 17:32:14]

ditto

[frankf, 2013/04/12 18:00:13]

Done.

+  def _RunTest(self, test, timeout):
+    self.adb.ClearApplicationState(self.package_name)
+    if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test):
+      self.flags.RemoveFlags(['--disable-fre'])
+    else:
+      self.flags.AddFlags(['--disable-fre'])
+    return self.adb.RunUIAutomatorTest(
+        test, self.test_pkg.GetPackageName(), timeout)
+