[Android] Rework device filtering and add DeviceUtils.HealthyDevices.

build/android/screenshot.py

 #!/usr/bin/env python
 
 # 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.
 
 """Takes a screenshot or a screen video capture from an Android device."""
 
 import logging
 import optparse
 import os
 import sys
 
 from pylib import screenshot
-from pylib.device import adb_wrapper
-from pylib.device import device_filter
+from pylib.device import device_errors
 from pylib.device import device_utils
 
 def _PrintMessage(heading, eol='\n'):
   sys.stdout.write('%s%s' % (heading, eol))
   sys.stdout.flush()
 
 
 def _CaptureScreenshot(device, host_file):
   host_file = device.TakeScreenshot(host_file)
   _PrintMessage('Screenshot written to %s' % os.path.abspath(host_file))
@@ skipping 33 matching lines @@
                            default=4, type='float')
   video_options.add_option('-r', '--rotate', help='Rotate video by 90 degrees.',
                            default=False, action='store_true')
   video_options.add_option('-s', '--size', metavar='WIDTHxHEIGHT',
                            help='Frame size to use instead of the device '
                            'screen size.', default=None)
   parser.add_option_group(video_options)
 
   (options, args) = parser.parse_args()
 
+  if len(args) > 1:
+    parser.error('Too many positional arguments.')
+  host_file = args[0] if args else options.file
+
   if options.verbose:
     logging.getLogger().setLevel(logging.DEBUG)
 
-  devices = adb_wrapper.AdbWrapper.Devices(
-      filters=device_filter.DefaultFilters())
+  devices = device_utils.DeviceUtils.HealthyDevices()
 
-  if not options.device and len(devices) > 1:
-    parser.error('Multiple devices are attached. '
-                 'Please specify device serial number with --device.')
-  elif not options.device and len(devices) == 1:
-    options.device = devices[0]
-
-  if len(args) > 1:
-    parser.error('Too many positional arguments.')
-  host_file = args[0] if args else options.file
-  device = device_utils.DeviceUtils(options.device)
+  if not options.device:
+    if len(devices) > 1:
+      parser.error('Multiple devices are attached. '
+                   'Please specify device serial number with --device.')
+    elif len(devices) == 1:
+      device = devices[0]
+    else:
+      raise device_errors.NoDevicesError()
+  else:
+    device = device_utils.DeviceUtils(options.device)
 
   if options.video:
     _CaptureVideo(device, host_file, options)
   else:
     _CaptureScreenshot(device, host_file)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())