[Android] Move getting the list of devices out of test_dispatcher.

build/android/pylib/gtest/setup.py

 # Copyright 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.
 
 """Generates test runner factory and tests for GTests."""
 
 import fnmatch
 import glob
 import logging
 import os
 import shutil
 import sys
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import ports
-from pylib.base import base_test_result
 
-import gtest_config
 import test_package_apk
 import test_package_exe
 import test_runner
 
 sys.path.insert(0,
                 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib'))
 from common import unittest_util
 
 
 _ISOLATE_FILE_PATHS = {
@@ skipping 220 matching lines @@
       tests, bool(gtest_filter), bool(gtest_filter))
   tests = unittest_util.FilterTestNames(
       tests, _GetDisabledTestsFilterFromFile(suite_name))
 
   if gtest_filter:
     tests = unittest_util.FilterTestNames(tests, gtest_filter)
 
   return tests
 
 
-def Setup(test_options):
+def Setup(test_options, devices):
   """Create the test runner factory and tests.
 
   Args:
     test_options: A GTestOptions object.
+    devices: A list of attached devices.
 
   Returns:
     A tuple of (TestRunnerFactory, tests).
   """
 
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   test_package = test_package_apk.TestPackageApk(test_options.suite_name)
   if not os.path.exists(test_package.suite_path):
     test_package = test_package_exe.TestPackageExecutable(
         test_options.suite_name)
     if not os.path.exists(test_package.suite_path):
       raise Exception(
           'Did not find %s target. Ensure it has been built.'
           % test_options.suite_name)
   logging.warning('Found target %s', test_package.suite_path)
 
   _GenerateDepsDirUsingIsolate(test_options.suite_name)
 
   # Constructs a new TestRunner with the current options.
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         test_options,
         device,
         test_package)
 
-  attached_devices = android_commands.GetAttachedDevices()
   tests = _GetTestsFiltered(test_options.suite_name, test_options.gtest_filter,
-                            TestRunnerFactory, attached_devices)
+                            TestRunnerFactory, devices)
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
-    num_devices = len(attached_devices)
+    num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)