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

build/android/update_verification.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Runs semi-automated update testing on a non-rooted device."""
 import logging
 import optparse
 import os
 import shutil
 import sys
 import time
 
-from pylib.device import adb_wrapper
-from pylib.device import device_filter
 from pylib.device import device_utils
 
 def _SaveAppData(device, package_name, from_apk=None, data_dir=None):
   def _BackupAppData(data_dir=None):
     device.adb.Backup(package_name)
     backup_file = os.path.join(os.getcwd(), 'backup.ab')
     assert os.path.exists(backup_file), 'Backup failed.'
     if data_dir:
       if not os.path.isdir(data_dir):
         os.makedirs(data_dir)
@@ skipping 75 matching lines @@
   parser.add_option('--to-apk', help='APK to update to.')
   parser.add_option('--app-data',
                     help=('Path to the application data to be restored or the '
                           'directory where the data should be saved.'))
   (options, args) = parser.parse_args()
 
   if args:
     parser.print_help(sys.stderr)
     parser.error('Unknown arguments: %s.' % args)
 
-  devices = adb_wrapper.AdbWrapper.Devices(
-      filters=device_filter.DefaultFilters())
+  devices = device_utils.DeviceUtils.HealthyDevices()
   if len(devices) != 1:
     parser.error('Exactly 1 device must be attached.')
-  device = device_utils.DeviceUtils(devices[0])
+  device = devices[0]
 
   if options.from_apk:
     assert os.path.isfile(options.from_apk)
 
   if options.save:
     if not options.package_name:
       parser.print_help(sys.stderr)
       parser.error('Missing --package-name.')
     _SaveAppData(device, options.package_name, from_apk=options.from_apk,
                  data_dir=options.app_data)
   else:
     if not options.to_apk or not options.app_data:
       parser.print_help(sys.stderr)
       parser.error('Missing --to-apk or --app-data.')
     assert os.path.isfile(options.to_apk)
     assert os.path.isfile(options.app_data)
     _VerifyAppUpdate(device, options.to_apk, options.app_data,
                      from_apk=options.from_apk)
 
 
 if __name__ == '__main__':
   main()