[Android] Don't use a device blacklist if one isn't provided. (RELAND 2)

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 35 matching lines @@
 
 class _PHASES(object):
   WIPE = 'wipe'
   PROPERTIES = 'properties'
   FINISH = 'finish'
 
   ALL = [WIPE, PROPERTIES, FINISH]
 
 
 def ProvisionDevices(args):
-  if args.blacklist_file:
-    blacklist = device_blacklist.Blacklist(args.blacklist_file)
-  else:
-    # TODO(jbudorick): Remove once the bots have switched over.
-    blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
+  blacklist = (device_blacklist.Blacklist(args.blacklist_file)
+               if args.blacklist_file
+               else None)
 
   devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
   if args.device:
     devices = [d for d in devices if d == args.device]
     if not devices:
       raise device_errors.DeviceUnreachableError(args.device)
 
   parallel_devices = device_utils.DeviceUtils.parallel(devices)
   parallel_devices.pMap(ProvisionDevice, blacklist, args)
   if args.auto_reconnect:
     _LaunchHostHeartbeat()
-  blacklisted_devices = blacklist.Read()
+  blacklisted_devices = blacklist.Read() if blacklist else []
   if args.output_device_blacklist:
     with open(args.output_device_blacklist, 'w') as f:
       json.dump(blacklisted_devices, f)
   if all(d in blacklisted_devices for d in devices):
     raise device_errors.NoDevicesError
   return 0
 
 
 def ProvisionDevice(device, blacklist, options):
   if options.reboot_timeout:
@@ skipping 367 matching lines @@
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   run_tests_helper.SetLogLevel(args.verbose)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())