[Android] Fix blacklist handling for perf tests in platform mode.

build/android/pylib/local/device/local_device_perf_test_run.py

 # Copyright 2016 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 io
 import json
 import logging
 import os
 import pickle
 import shutil
 import tempfile
 import time
 import zipfile
 
 from devil.android import battery_utils
-from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android.tools import device_recovery
 from devil.android.tools import device_status
 from devil.utils import cmd_helper
 from devil.utils import parallelizer
 from pylib import constants
 from pylib.base import base_test_result
@@ skipping 262 matching lines @@
       devices = active_devices
     return sorted(devices)
 
   #override
   def RunTests(self):
     # Affinitize the tests.
     self._SplitTestsByAffinity()
     if not self._test_buckets:
       raise local_device_test_run.NoTestsError()
 
-    blacklist = (device_blacklist.Blacklist(self._env.blacklist)
-                 if self._env.blacklist
-                 else None)
-
     def run_perf_tests(shard_id):
-      if device_status.IsBlacklisted(str(self._devices[shard_id]), blacklist):
+      if device_status.IsBlacklisted(
+          str(self._devices[shard_id]), self._env.blacklist):
         logging.warning('Device %s is not active. Will not create shard %s.',
                         str(self._devices[shard_id]), shard_id)
         return []
       s = TestShard(self._env, self._test_instance, self._devices[shard_id],
                     shard_id, self._test_buckets[shard_id],
                     retries=self._env.max_tries, timeout=self._timeout)
       return s.RunTestsOnShard()
 
     device_indices = range(min(len(self._devices), len(self._test_buckets)))
     shards = parallelizer.Parallelizer(device_indices).pMap(run_perf_tests)
@@ skipping 62 matching lines @@
   # override
   def _RunTest(self, _device, _test):
     raise NotImplementedError
 
 
 class TestDictVersionError(Exception):
   pass
 
 class PerfTestRunGetStepsError(Exception):
   pass