[Android] Don't use a device blacklist if one isn't provided.

build/android/buildbot/bb_device_status_check.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.
 
 """A class to keep track of devices across builds and report state."""
 import argparse
 import json
 import logging
@@ skipping 277 matching lines @@
   parser.add_argument('--json-output',
                       help='Output JSON information into a specified file.')
   parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_argument('-v', '--verbose', action='count', default=1,
                       help='Log more information.')
 
   args = parser.parse_args()
 
   run_tests_helper.SetLogLevel(args.verbose)
 
-  if args.blacklist_file:
-    blacklist = device_blacklist.Blacklist(args.blacklist_file)
-  else:
-    # TODO(jbudorick): Remove this once bots pass the blacklist file.
-    blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
+  blacklist = (device_blacklist.Blacklist(args.blacklist_file)
+               if args.blacklist_file
+               else None)
 
   last_devices_path = os.path.join(
       args.out_dir, device_list.LAST_DEVICES_FILENAME)
   try:
     expected_devices = set(
         device_list.GetPersistentDeviceList(last_devices_path))
   except IOError:
     expected_devices = set()
 
   usb_devices = set(lsusb.get_android_devices())
@@ skipping 59 matching lines @@
   live_devices = [status['serial'] for status in statuses
                   if (status['adb_status'] == 'device'
                       and status['serial'] not in blacklist.Read())]
 
   # If all devices failed, or if there are no devices, it's an infra error.
   return 0 if live_devices else constants.INFRA_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())