Revert of [Android] Remove adb_commands from telemetry. (Reland)

tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py

Index: tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
index c03b3c9afc7477a23693a9d767a8bc1f37e0c6c6..da57d094fcb7582cb494a013e1ee955084671dd9 100644
--- a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
@@ -5,14 +5,9 @@
 import unittest
 
 from telemetry import benchmark
-from telemetry.core import util
+from telemetry.core.backends import adb_commands
 from telemetry.core.backends import android_command_line_backend
 from telemetry.unittest_util import options_for_unittests
-
-util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
-from pylib.device import device_errors # pylint: disable=import-error
-from pylib.device import device_utils # pylint: disable=import-error
-
 
 class _MockBackendSettings(object):
   pseudo_exec_name = 'chrome'
@@ -54,19 +49,16 @@
     Requires a device connected to the host.
     """
     serial = options_for_unittests.GetCopy().device
-    if serial:
-      device = device_utils.DeviceUtils(serial)
-    else:
-      devices = device_utils.DeviceUtils.HealthyDevices()
-      if not devices:
-        raise device_errors.NoDevicesError()
-      device = devices[0]
+    if not serial:
+      serial = adb_commands.GetAttachedDevices()[0]
     cmd_file = '/data/local/tmp/test_cmd'
+    adb = adb_commands.AdbCommands(device=serial)
     backend_settings = _MockBackendSettings('/data/local/tmp/test_cmd')
     startup_args = ['--some', '--test', '--args']
+    device = adb.device()
     device.WriteFile(cmd_file, 'chrome --args --to --save')
     with android_command_line_backend.SetUpCommandLineFlags(
-        device, backend_settings, startup_args):
+        adb, backend_settings, startup_args):
       self.assertEqual('chrome --some --test --args',
                        device.ReadFile(cmd_file).strip())
     self.assertEqual('chrome --args --to --save',
@@ -80,19 +72,16 @@
     Requires a device connected to the host.
     """
     serial = options_for_unittests.GetCopy().device
-    if serial:
-      device = device_utils.DeviceUtils(serial)
-    else:
-      devices = device_utils.DeviceUtils.HealthyDevices()
-      if not devices:
-        raise device_errors.NoDevicesError()
-      device = devices[0]
+    if not serial:
+      serial = adb_commands.GetAttachedDevices()[0]
     cmd_file = '/data/local/tmp/test_cmd'
+    adb = adb_commands.AdbCommands(device=serial)
     backend_settings = _MockBackendSettings('/data/local/tmp/test_cmd')
     startup_args = ['--some', '--test', '--args']
+    device = adb.device()
     device.RunShellCommand(['rm', '-f', cmd_file], check_return=True)
     with android_command_line_backend.SetUpCommandLineFlags(
-        device, backend_settings, startup_args):
+        adb, backend_settings, startup_args):
       self.assertEqual('chrome --some --test --args',
                        device.ReadFile(cmd_file).strip())
     self.assertFalse(device.FileExists(cmd_file))