[Android] Move some pylib modules into devil/

build/android/pylib/device/device_blacklist.py

Index: build/android/pylib/device/device_blacklist.py
diff --git a/build/android/pylib/device/device_blacklist.py b/build/android/pylib/device/device_blacklist.py
index 0724654be7b9b5575eb551ce9eda7cb82ca5e095..fad1ca698382bc3572adf0322fcd39e7b27f1ba3 100644
--- a/build/android/pylib/device/device_blacklist.py
+++ b/build/android/pylib/device/device_blacklist.py
@@ -1,82 +1,8 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright 2015 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 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')
-
-class Blacklist(object):
-
-  def __init__(self, path):
-    self._blacklist_lock = threading.RLock()
-    self._path = path
-
-  def Read(self):
-    """Reads the blacklist from the blacklist file.
-
-    Returns:
-      A list containing bad devices.
-    """
-    with self._blacklist_lock:
-      if not os.path.exists(self._path):
-        return []
-
-      with open(self._path, 'r') as f:
-        return json.load(f)
-
-  def Write(self, blacklist):
-    """Writes the provided blacklist to the blacklist file.
-
-    Args:
-      blacklist: list of bad devices to write to the blacklist file.
-    """
-    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.
-    """
-    with self._blacklist_lock:
-      blacklist = ReadBlacklist()
-      blacklist.extend(devices)
-      WriteBlacklist(blacklist)
-
-  def Reset(self):
-    """Erases the blacklist file if it exists."""
-    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()
+# pylint: disable=unused-wildcard-import
+# pylint: disable=wildcard-import
 
+from devil.android.device_blacklist import *