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

tools/telemetry/telemetry/internal/platform/android_device.py

Index: tools/telemetry/telemetry/internal/platform/android_device.py
diff --git a/tools/telemetry/telemetry/internal/platform/android_device.py b/tools/telemetry/telemetry/internal/platform/android_device.py
index 5c73d343d5e568bb21cbdba0efbe16dbf927056b..a2c278da094d1290553153935aa708e65be2e946 100644
--- a/tools/telemetry/telemetry/internal/platform/android_device.py
+++ b/tools/telemetry/telemetry/internal/platform/android_device.py
@@ -12,7 +12,6 @@
 
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
 from pylib import constants
-from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 
@@ -34,8 +33,8 @@
     self._enable_performance_mode = enable_performance_mode
 
   @classmethod
-  def GetAllConnectedDevices(cls, blacklist):
-    device_serials = GetDeviceSerials(blacklist)
+  def GetAllConnectedDevices(cls):
+    device_serials = GetDeviceSerials()
     return [cls(s) for s in device_serials]
 
   @property
@@ -47,20 +46,20 @@
     return self._enable_performance_mode
 
 
-def _ListSerialsOfHealthyOnlineDevices(blacklist):
+def _ListSerialsOfHealthyOnlineDevices():
   return [d.adb.GetDeviceSerial()
-          for d in device_utils.DeviceUtils.HealthyDevices(blacklist)
-          if d.IsOnline()]
+          for d in device_utils.DeviceUtils.HealthyDevices() if
+          d.IsOnline()]
 
 
-def GetDeviceSerials(blacklist):
+def GetDeviceSerials():
   """Return the list of device serials of healthy devices.
 
   If a preferred device has been set with ANDROID_SERIAL, it will be first in
   the returned list. The arguments specify what devices to include in the list.
   """
 
-  device_serials = _ListSerialsOfHealthyOnlineDevices(blacklist)
+  device_serials = _ListSerialsOfHealthyOnlineDevices()
 
   # The monsoon provides power for the device, so for devices with no
   # real battery, we need to turn them on after the monsoon enables voltage
@@ -82,8 +81,8 @@
 
 Waiting for device...
 """)
-      util.WaitFor(_ListSerialsOfHealthyOnlineDevices(blacklist), 600)
-      device_serials = _ListSerialsOfHealthyOnlineDevices(blacklist)
+      util.WaitFor(_ListSerialsOfHealthyOnlineDevices(), 600)
+      device_serials = _ListSerialsOfHealthyOnlineDevices()
     except IOError:
       return []
 
@@ -104,19 +103,12 @@
         'No adb command found. Will not try searching for Android browsers.')
     return None
 
-  if (finder_options.device
-      and finder_options.device in GetDeviceSerials(finder_options)):
+  if finder_options.device and finder_options.device in GetDeviceSerials():
     return AndroidDevice(
         finder_options.device,
         enable_performance_mode=not finder_options.no_performance_mode)
 
-  if finder_options.android_blacklist_file:
-    blacklist = device_blacklist.Blacklist(
-        finder_options.android_blacklist_file)
-  else:
-    blacklist = None
-
-  devices = AndroidDevice.GetAllConnectedDevices(blacklist)
+  devices = AndroidDevice.GetAllConnectedDevices()
   if len(devices) == 0:
     logging.info('No android devices found.')
     return None
@@ -150,22 +142,17 @@
   try:
     os.environ['PATH'] = os.pathsep.join(
         [os.path.dirname(adb_path), os.environ['PATH']])
-    device_utils.DeviceUtils.HealthyDevices(None)
+    device_utils.DeviceUtils.HealthyDevices()
     return True
   except (device_errors.CommandFailedError, device_errors.CommandTimeoutError,
           OSError):
     return False
 
 
-def FindAllAvailableDevices(options):
+def FindAllAvailableDevices(_):
   """Returns a list of available devices.
   """
-  if options.android_blacklist_file:
-    blacklist = device_blacklist.Blacklist(options.android_blacklist_file)
-  else:
-    blacklist = None
-
   if not CanDiscoverDevices():
     return []
   else:
-    return AndroidDevice.GetAllConnectedDevices(blacklist)
+    return AndroidDevice.GetAllConnectedDevices()