[devil refactor] Prepare clients for DeviceUnreachableError

tools/cygprofile/profile_android_startup.py

 #! /usr/bin/env python
 # Copyright (c) 2015 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.
 
 """Utility library for running a startup profile on an Android device.
 
 Sets up a device for cygprofile, disables sandboxing permissions, and sets up
 support for web page replay, device forwarding, and fake certificate authority
 to make runs repeatable.
@@ skipping 212 matching lines @@
     Args:
       path_to_tests: The location on the host machine with the compiled
                      cygprofile test binary.
     Returns:
       The exit code for the tests.
     """
     device_path = '/data/local/tmp/cygprofile_unittests'
     self._device.PushChangedFiles([(self._cygprofile_tests, device_path)])
     try:
       self._device.RunShellCommand(device_path, check_return=True)
-    except device_errors.CommandFailedError:
+    except (device_errors.CommandFailedError,
+            device_errors.DeviceUnreachableError):
       # TODO(jbudorick): Let the exception propagate up once clients can
       # handle it.
       logging.exception('Failure while running cygprofile_unittests:')
       return 1
     return 0
 
   def CollectProfile(self, apk, package_info):
     """Run a profile and collect the log files.
 
     Args:
@@ skipping 165 matching lines @@
     raise Exception('Unable to determine package info for %s' % args.apk_path)
 
   profiler = AndroidProfileTool(
       args.output_directory, host_cyglog_dir=args.trace_directory)
   profiler.CollectProfile(args.apk_path, package_info)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())