[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

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."""
 # pylint: disable=W0212
 
 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.device import adb_wrapper
 from pylib.gtest import test_package_apk
 from pylib.gtest import test_package_exe
 from pylib.gtest import test_runner
 
 sys.path.insert(0,
                 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
                              'common'))
 import unittest_util # pylint: disable=F0401
 
 
@@ skipping 183 matching lines @@
         a TestRunner.
     devices: A list of device ids.
 
   Returns:
     All the tests in the test suite.
   """
   for device in devices:
     try:
       logging.info('Obtaining tests from %s', device)
       return runner_factory(device, 0).GetAllTests()
-    except (android_commands.errors.WaitForResponseTimedOutError,
-            android_commands.errors.DeviceUnresponsiveError), e:
+    except (adb_wrapper.CommandTimeoutError,

[craigdh, 2014/04/09 15:55:02]

doesn't this need rebasing? I thought you changed this to use a test runner
here.

+            adb_wrapper.DeviceUnreachableError), e:
       logging.warning('Failed obtaining test list from %s with exception: %s',
                       device, e)
   raise Exception('Failed to obtain test list from devices.')
 
 
 def _FilterTestsUsingPrefixes(all_tests, pre=False, manual=False):
   """Removes tests with disabled prefixes.
 
   Args:
     all_tests: List of tests to filter.
@@ skipping 83 matching lines @@
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
   if test_options.suite_name != 'content_browsertests':
     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)