[Android] Remove TestServerSpawner dependency from ChromeNativeTestInstrumentationTestRunner.

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 3ca0374ca71693eea2dce3f047c1d115eb2b7407..c48c8659ed9672049c0260336ea372be86743169 100644
--- a/build/android/pylib/gtest/local_device_gtest_run.py
+++ b/build/android/pylib/gtest/local_device_gtest_run.py
@@ -24,9 +24,6 @@ _EXTRA_COMMAND_LINE_FILE = (
     'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFile')
 _EXTRA_COMMAND_LINE_FLAGS = (
     'org.chromium.native_test.ChromeNativeTestActivity.CommandLineFlags')
-_EXTRA_ENABLE_TEST_SERVER_SPAWNER = (
-    'org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner'
-        '.EnableTestServerSpawner')
 
 _MAX_SHARD_SIZE = 256
 
@@ -44,9 +41,6 @@ class _ApkDelegate(object):
     self._component = '%s/%s' % (self._package, self._runner)
     self._enable_test_server_spawner = False
 
-  def EnableTestServerSpawner(self):
-    self._enable_test_server_spawner = True
-
   def Install(self, device):
     device.Install(self._apk)
 
@@ -57,8 +51,6 @@ class _ApkDelegate(object):
       extras = {
         _EXTRA_COMMAND_LINE_FILE: command_line_file.name,
       }
-      if self._enable_test_server_spawner:
-        extras[_EXTRA_ENABLE_TEST_SERVER_SPAWNER] = '1'
 
       return device.StartInstrumentation(
           self._component, extras=extras, raw=False, **kwargs)
@@ -81,9 +73,6 @@ class _ExeDelegate(object):
       self._deps_host_path = None
     self._test_run = tr
 
-  def EnableTestServerSpawner(self):
-    pass
-
   def Install(self, device):
     # TODO(jbudorick): Look into merging this with normal data deps pushing if
     # executables become supported on nonlocal environments.
@@ -143,6 +132,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
     elif self._test_instance.exe:
       self._delegate = _ExeDelegate(self, self._test_instance.exe)
 
+    self._servers = {}
+
   #override
   def TestPackage(self):
     return self._test_instance._suite
@@ -161,8 +152,14 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
           for h, d in host_device_tuples]
       dev.PushChangedFiles(host_device_tuples)
 
+      self._servers[str(dev)] = []
       if self.TestPackage() in _SUITE_REQUIRES_TEST_SERVER_SPAWNER:
-        self._delegate.EnableTestServerSpawner()
+        self._servers[str(dev)].append(
+            local_test_server_spawner.LocalTestServerSpawner(
+                ports.AllocateTestServerPort(), dev, self.GetTool(dev)))
+
+      for s in self._servers[str(dev)]:
+        s.SetUp()
 
     self._env.parallel_devices.pMap(individual_device_set_up,
                                     self._test_instance.GetDataDependencies())
@@ -194,6 +191,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
     # Run the test.
     output = self._delegate.RunWithFlags(device, '--gtest_filter=%s' % test,
                                          timeout=900, retries=0)
+    for s in self._servers[str(device)]:
+      s.Reset()
     self._delegate.Clear(device)
 
     # Parse the output.
@@ -203,5 +202,9 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun):
 
   #override
   def TearDown(self):
-    pass
+    def individual_device_tear_down(dev):
+      for s in self._servers[str(dev)]:
+        s.TearDown()
+
+    self._env.parallel_devices.pMap(individual_device_tear_down)