[Android] Refactor browser test execution. (RELAND)

build/android/pylib/gtest/local_device_gtest_run.py

Index: build/android/pylib/gtest/local_device_gtest_run.py
diff --git a/build/android/pylib/gtest/local_device_gtest_run.py b/build/android/pylib/gtest/local_device_gtest_run.py
index c375b970943bc50a7f76e2b689a7aa7ab0dc52fa..f1cea4e03f49a10543d12f287b4dbc830f06c9bc 100644
--- a/build/android/pylib/gtest/local_device_gtest_run.py
+++ b/build/android/pylib/gtest/local_device_gtest_run.py
@@ -16,7 +16,6 @@ from pylib.gtest import gtest_test_instance
 from pylib.local import local_test_server_spawner
 from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_test_run
-from pylib.utils import apk_helper
 from pylib.utils import device_temp_file
 
 _COMMAND_LINE_FLAGS_SUPPORTED = True
@@ -25,9 +24,9 @@ _EXTRA_COMMAND_LINE_FILE = (
     'org.chromium.native_test.NativeTestActivity.CommandLineFile')
 _EXTRA_COMMAND_LINE_FLAGS = (
     'org.chromium.native_test.NativeTestActivity.CommandLineFlags')
-_EXTRA_NATIVE_TEST_ACTIVITY = (
+_EXTRA_TEST_LIST = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner'
-        '.NativeTestActivity')
+        '.TestList')
 
 _MAX_SHARD_SIZE = 256
 
@@ -53,30 +52,32 @@ def PullAppFilesImpl(device, package, files, directory):
     device.PullFile(device_file, host_file)
 
 class _ApkDelegate(object):
-  def __init__(self, apk):
-    self._apk = apk
+  def __init__(self, test_instance):
+    self._activity = test_instance.activity
+    self._apk = test_instance.apk
+    self._package = test_instance.package
+    self._runner = test_instance.runner
 
-    helper = apk_helper.ApkHelper(self._apk)
-    self._activity = helper.GetActivityName()
-    self._package = helper.GetPackageName()
-    self._runner = helper.GetInstrumentationName()
     self._component = '%s/%s' % (self._package, self._runner)
-    self._enable_test_server_spawner = False
+    self._extras = test_instance.extras
 
   def Install(self, device):
     device.Install(self._apk)
 
-  def RunWithFlags(self, device, flags, **kwargs):
+  def Run(self, test, device, flags=None, **kwargs):
+    extras = dict(self._extras)
+
     with device_temp_file.DeviceTempFile(device.adb) as command_line_file:
-      device.WriteFile(command_line_file.name, '_ %s' % flags)
+      device.WriteFile(command_line_file.name, '_ %s' % flags if flags else '_')
+      extras[_EXTRA_COMMAND_LINE_FILE] = command_line_file.name
 
-      extras = {
-        _EXTRA_COMMAND_LINE_FILE: command_line_file.name,
-        _EXTRA_NATIVE_TEST_ACTIVITY: self._activity,
-      }
+      with device_temp_file.DeviceTempFile(device.adb) as test_list_file:
+        if test:
+          device.WriteFile(test_list_file.name, '\n'.join(test))
+          extras[_EXTRA_TEST_LIST] = test_list_file.name
 
-      return device.StartInstrumentation(
-          self._component, extras=extras, raw=False, **kwargs)
+        return device.StartInstrumentation(
+            self._component, extras=extras, raw=False, **kwargs)
 
   def PullAppFiles(self, device, files, directory):
     PullAppFilesImpl(device, self._package, files, directory)
@@ -86,7 +87,7 @@ class _ApkDelegate(object):
 
 
 class _ExeDelegate(object):
-  def __init__(self, exe, tr):
+  def __init__(self, tr, exe):
     self._exe_host_path = exe
     self._exe_file_name = os.path.split(exe)[-1]
     self._exe_device_path = '%s/%s' % (
@@ -107,12 +108,15 @@ class _ExeDelegate(object):
       host_device_tuples.append((self._deps_host_path, self._deps_device_path))
     device.PushChangedFiles(host_device_tuples)
 
-  def RunWithFlags(self, device, flags, **kwargs):
+  def Run(self, test, device, flags=None, **kwargs):
     cmd = [
         self._test_run.GetTool(device).GetTestWrapper(),
         self._exe_device_path,
-        flags,
     ]
+    if test:
+      cmd.append('--gtest_filter=%s' % ':'.join(test))
+    if flags:
+      cmd.append(flags)
     cwd = constants.TEST_EXECUTABLE_DIR
 
     env = {
@@ -152,7 +156,7 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
     super(LocalDeviceGtestRun, self).__init__(env, test_instance)
 
     if self._test_instance.apk:
-      self._delegate = _ApkDelegate(self._test_instance.apk)
+      self._delegate = _ApkDelegate(self._test_instance)
     elif self._test_instance.exe:
       self._delegate = _ExeDelegate(self, self._test_instance.exe)
 
@@ -194,21 +198,18 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
 
   #override
   def _CreateShards(self, tests):
-    if self._test_instance.suite in gtest_test_instance.BROWSER_TEST_SUITES:
-      return tests
-    else:
-      device_count = len(self._env.devices)
-      shards = []
-      for i in xrange(0, device_count):
-        unbounded_shard = tests[i::device_count]
-        shards += [unbounded_shard[j:j+_MAX_SHARD_SIZE]
-                   for j in xrange(0, len(unbounded_shard), _MAX_SHARD_SIZE)]
-      return [':'.join(s) for s in shards]
+    device_count = len(self._env.devices)
+    shards = []
+    for i in xrange(0, device_count):
+      unbounded_shard = tests[i::device_count]
+      shards += [unbounded_shard[j:j+_MAX_SHARD_SIZE]
+                 for j in xrange(0, len(unbounded_shard), _MAX_SHARD_SIZE)]
+    return shards
 
   #override
   def _GetTests(self):
-    tests = self._delegate.RunWithFlags(
-        self._env.devices[0], '--gtest_list_tests')
+    tests = self._delegate.Run(
+        None, self._env.devices[0], flags='--gtest_list_tests')
     tests = gtest_test_instance.ParseGTestListTests(tests)
     tests = self._test_instance.FilterTests(tests)
     return tests
@@ -216,8 +217,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
   #override
   def _RunTest(self, device, test):
     # Run the test.
-    output = self._delegate.RunWithFlags(
-        device, '--gtest_filter=%s' % test, timeout=900, retries=0)
+    output = self._delegate.Run(
+        test, device, timeout=900, retries=0)
     for s in self._servers[str(device)]:
       s.Reset()
     if self._test_instance.app_files: