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

build/android/devil/android/device_blacklist.py

 # Copyright 2014 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.
 
 import json
-import logging
 import os
 import threading
 
 from pylib import constants
 
 # TODO(jbudorick): Remove this once the blacklist is optional.
 BLACKLIST_JSON = os.path.join(
     constants.DIR_SOURCE_ROOT,
     os.environ.get('CHROMIUM_OUT_DIR', 'out'),
     'bad_devices.json')
@@ skipping 26 matching lines @@
     with self._blacklist_lock:
       with open(self._path, 'w') as f:
         json.dump(list(set(blacklist)), f)
 
   def Extend(self, devices):
     """Adds devices to blacklist file.
 
     Args:
       devices: list of bad devices to be added to the blacklist file.
     """
-    logging.info('Adding %s to blacklist %s', ','.join(devices), self._path)
     with self._blacklist_lock:
-      blacklist = self.Read()
+      blacklist = ReadBlacklist()
       blacklist.extend(devices)
-      self.Write(blacklist)
+      WriteBlacklist(blacklist)
 
   def Reset(self):
     """Erases the blacklist file if it exists."""
-    logging.info('Resetting blacklist %s', self._path)
     with self._blacklist_lock:
       if os.path.exists(self._path):
         os.remove(self._path)
 
+
+def ReadBlacklist():
+  # TODO(jbudorick): Phase out once all clients have migrated.
+  return Blacklist(BLACKLIST_JSON).Read()
+
+
+def WriteBlacklist(blacklist):
+  # TODO(jbudorick): Phase out once all clients have migrated.
+  Blacklist(BLACKLIST_JSON).Write(blacklist)
+
+
+def ExtendBlacklist(devices):
+  # TODO(jbudorick): Phase out once all clients have migrated.
+  Blacklist(BLACKLIST_JSON).Extend(devices)
+
+
+def ResetBlacklist():
+  # TODO(jbudorick): Phase out once all clients have migrated.
+  Blacklist(BLACKLIST_JSON).Reset()
+