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

build/android/pylib/forwarder.py

 # Copyright (c) 2012 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.
 
 # pylint: disable=W0212
 
 import fcntl
 import logging
 import os
 import psutil
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib import valgrind_tools
+from pylib.device import device_errors
 
 # TODO(jbudorick) Remove once telemetry gets switched over.
 import pylib.android_commands
 import pylib.device.device_utils
 
 
 def _GetProcessStartTime(pid):
   return psutil.Process(pid).create_time
 
 
@@ skipping 308 matching lines @@
 
     cmd = '%s %s --kill-server' % (tool.GetUtilWrapper(),
                                    Forwarder._DEVICE_FORWARDER_PATH)
     device.old_interface.GetAndroidToolStatusAndOutput(
         cmd, lib_path=Forwarder._DEVICE_FORWARDER_FOLDER)
 
     # TODO(pliard): Remove the following call to KillAllBlocking() when we are
     # sure that the old version of device_forwarder (not supporting
     # 'kill-server') is not running on the bots anymore.
     timeout_sec = 5
-    processes_killed = device.old_interface.KillAllBlocking(
-        'device_forwarder', timeout_sec)
-    if not processes_killed:
+    try:
+      device.KillAll(
+          'device_forwarder', blocking=True, timeout=timeout_sec)
+    except device_errors.CommandFailedError:
       pids = device.old_interface.ExtractPid('device_forwarder')
       if pids:
-        raise Exception('Timed out while killing device_forwarder')
+        raise