Revert of [Android] Add --blacklist-file as a command-line option.

build/android/tombstones.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.
 #
 # Find the most recent tombstone file(s) on all connected devices
 # and prints their stacks.
 #
 # Assumes tombstone file was created with current symbols.
 
 import datetime
 import itertools
 import logging
 import multiprocessing
 import os
 import re
 import subprocess
 import sys
 import optparse
 
 from pylib.device import adb_wrapper
-from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
 
 
 _TZ_UTC = {'TZ': 'UTC'}
 
 def _ListTombstones(device):
   """List the tombstone files on the device.
 
@@ skipping 182 matching lines @@
 def main():
   custom_handler = logging.StreamHandler(sys.stdout)
   custom_handler.setFormatter(run_tests_helper.CustomFormatter())
   logging.getLogger().addHandler(custom_handler)
   logging.getLogger().setLevel(logging.INFO)
 
   parser = optparse.OptionParser()
   parser.add_option('--device',
                     help='The serial number of the device. If not specified '
                          'will use all devices.')
-  parser.add_option('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_option('-a', '--all-tombstones', action='store_true',
                     help="""Resolve symbols for all tombstones, rather than just
                          the most recent""")
   parser.add_option('-s', '--stack', action='store_true',
                     help='Also include symbols for stack data')
   parser.add_option('-w', '--wipe-tombstones', action='store_true',
                     help='Erase all tombstones from device after processing')
   parser.add_option('-j', '--jobs', type='int',
                     default=4,
                     help='Number of jobs to use when processing multiple '
                          'crash stacks.')
   options, _ = parser.parse_args()
 
-  if options.blacklist_file:
-    blacklist = device_blacklist.Blacklist(options.blacklist_file)
-  else:
-    blacklist = None
-
   if options.device:
     devices = [device_utils.DeviceUtils(options.device)]
   else:
-    devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
+    devices = device_utils.DeviceUtils.HealthyDevices()
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.
   # http://bugs.python.org/issue7980
   tombstones = []
   for device in devices:
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)
 
 
 if __name__ == '__main__':
   sys.exit(main())