[Android] Revise host_forwarder exception type & failure handling.

build/android/pylib/local/device/local_device_test_run.py

 # Copyright 2014 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.
 
 import fnmatch
 import functools
 import logging
 
+from devil import base_error
 from devil.android import device_errors
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.base import test_collection
 
 
 def handle_shard_failures(f):
   """A decorator that handles device failures for per-device functions.
 
@@ skipping 12 matching lines @@
   Args:
     f: the function being decorated. The function must take at least one
       argument, and that argument must be the device.
     on_failure: A binary function to call on failure.
   """
   def decorator(f):
     @functools.wraps(f)
     def wrapper(dev, *args, **kwargs):
       try:
         return f(dev, *args, **kwargs)
-      except device_errors.CommandFailedError:
-        logging.exception('Shard failed: %s(%s)', f.__name__, str(dev))
       except device_errors.CommandTimeoutError:
         logging.exception('Shard timed out: %s(%s)', f.__name__, str(dev))
       except device_errors.DeviceUnreachableError:
         logging.exception('Shard died: %s(%s)', f.__name__, str(dev))
+      except base_error.BaseError:
+        logging.exception('Shard failed: %s(%s)', f.__name__,
+                          str(dev))
       if on_failure:
         on_failure(dev, f.__name__)
       return None
 
     return wrapper
 
   return decorator
 
 
 class LocalDeviceTestRun(test_run.TestRun):
@@ skipping 104 matching lines @@
     return test
 
   def _GetTests(self):
     raise NotImplementedError
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError