[Android] Switch KillAll, StartActivity, and BroadcastIntent to DeviceUtils.

build/android/pylib/device/adb_wrapper.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.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
@@ skipping 33 matching lines @@
     """
     self._device_serial = str(device_serial)
 
   # pylint: disable=W0613
   @classmethod
   @decorators.WithTimeoutAndRetries
   def _RunAdbCmd(cls, arg_list, timeout=None, retries=None, check_error=True):
     cmd = ['adb'] + arg_list
     exit_code, output = cmd_helper.GetCmdStatusAndOutput(cmd)
     if exit_code != 0:
-      raise device_errors.CommandFailedError(
+      raise device_errors.AdbCommandFailedError(
           cmd, 'returned non-zero exit code %s, output: %s' %
           (exit_code, output))
     # This catches some errors, including when the device drops offline;
     # unfortunately adb is very inconsistent with error reporting so many
     # command failures present differently.
     if check_error and output[:len('error:')] == 'error:':
-      raise device_errors.CommandFailedError(arg_list, output)
+      raise device_errors.AdbCommandFailedError(arg_list, output)
     return output
   # pylint: enable=W0613
 
   def _DeviceAdbCmd(self, arg_list, timeout, retries, check_error=True):
     """Runs an adb command on the device associated with this object.
 
     Args:
       arg_list: A list of arguments to adb.
       timeout: Timeout in seconds.
       retries: Number of retries.
@@ skipping 86 matching lines @@
       command: The shell command to run.
       expect_rc: (optional) If set checks that the command's return code matches
         this value.
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
     Returns:
       The output of the shell command as a string.
 
     Raises:
-      device_errors.CommandFailedError: If the return code doesn't match
+      device_errors.AdbCommandFailedError: If the return code doesn't match
         |expect_rc|.
     """
     if expect_rc is None:
       actual_command = command
     else:
       actual_command = '%s; echo $?;' % command
     output = self._DeviceAdbCmd(
         ['shell', actual_command], timeout, retries, check_error=False)
     if expect_rc is not None:
       output_end = output.rstrip().rfind('\n') + 1
       rc = output[output_end:].strip()
       output = output[:output_end]
       if int(rc) != expect_rc:
-        raise device_errors.CommandFailedError(
+        raise device_errors.AdbCommandFailedError(
             ['shell', command],
             'shell command exited with code: %s' % rc,
             self._device_serial)
     return output
 
   def Logcat(self, filter_spec=None, timeout=_DEFAULT_TIMEOUT,
              retries=_DEFAULT_RETRIES):
     """Get the logcat output.
 
     Args:
@@ skipping 58 matching lines @@
     cmd = ['install']
     if forward_lock:
       cmd.append('-l')
     if reinstall:
       cmd.append('-r')
     if sd_card:
       cmd.append('-s')
     cmd.append(apk_path)
     output = self._DeviceAdbCmd(cmd, timeout, retries)
     if 'Success' not in output:
-      raise device_errors.CommandFailedError(cmd, output)
+      raise device_errors.AdbCommandFailedError(cmd, output)
 
   def Uninstall(self, package, keep_data=False, timeout=_DEFAULT_TIMEOUT,
                 retries=_DEFAULT_RETRIES):
     """Remove the app |package| from the device.
 
     Args:
       package: The package to uninstall.
       keep_data: (optional) If set keep the data and cache directories.
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
     """
     cmd = ['uninstall']
     if keep_data:
       cmd.append('-k')
     cmd.append(package)
     output = self._DeviceAdbCmd(cmd, timeout, retries)
     if 'Failure' in output:
-      raise device_errors.CommandFailedError(cmd, output)
+      raise device_errors.AdbCommandFailedError(cmd, output)
 
   def Backup(self, path, packages=None, apk=False, shared=False,
              nosystem=True, include_all=False, timeout=_DEFAULT_TIMEOUT,
              retries=_DEFAULT_RETRIES):
     """Write an archive of the device's data to |path|.
 
     Args:
       path: Local path to store the backup file.
       packages: List of to packages to be backed up.
       apk: (optional) If set include the .apk files in the archive.
@@ skipping 86 matching lines @@
 
   def Root(self, timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES):
     """Restarts the adbd daemon with root permissions, if possible.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
     """
     output = self._DeviceAdbCmd(['root'], timeout, retries)
     if 'cannot' in output:
-      raise device_errors.CommandFailedError(['root'], output)
+      raise device_errors.AdbCommandFailedError(['root'], output)