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

build/android/pylib/instrumentation/test_jar.py

 # Copyright (c) 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.
 
 """Helper class for instrumenation test jar."""
 # pylint: disable=W0702
 
 import logging
 import os
 import pickle
@@ skipping 152 matching lines @@
         tests_missing_annotations.append(test_method)
     return sorted(tests_missing_annotations)
 
   def _IsTestValidForSdkRange(self, test_name, attached_min_sdk_level):
     required_min_sdk_level = int(
         self.GetTestAnnotations(test_name).get('MinAndroidSdkLevel', 0))
     return (required_min_sdk_level is None or
             attached_min_sdk_level >= required_min_sdk_level)
 
   def GetAllMatchingTests(self, annotation_filter_list,
-                          exclude_annotation_list, test_filter, devices):
+                          exclude_annotation_list, test_filter):
     """Get a list of tests matching any of the annotations and the filter.
 
     Args:
       annotation_filter_list: List of test annotations. A test must have at
         least one of these annotations. A test without any annotations is
         considered to be SmallTest.
       exclude_annotation_list: List of test annotations. A test must not have
         any of these annotations.
       test_filter: Filter used for partial matching on the test method names.
-      devices: The set of devices against which tests will be run.
 
     Returns:
       List of all matching tests.
     """
     if annotation_filter_list:
       available_tests = self.GetAnnotatedTests(annotation_filter_list)
       # Include un-annotated tests in SmallTest.
       if annotation_filter_list.count(self._DEFAULT_ANNOTATION) > 0:
         for test in self._GetTestsMissingAnnotation():
           logging.warning(
@@ skipping 18 matching lines @@
       # Filters 'class.test' names and populates |tests| with the corresponding
       # 'package.path.class#test' names.
       tests = [
           sanitized_test_names[t] for t in unittest_util.FilterTestNames(
               sanitized_test_names.keys(), test_filter.replace('#', '.'))]
     else:
       tests = available_tests
 
     # Filter out any tests with SDK level requirements that don't match the set
     # of attached devices.
-    devices = device_utils.DeviceUtils.parallel(devices)
+    devices = device_utils.DeviceUtils.parallel()
     min_sdk_version = min(devices.build_version_sdk.pGet(None))
     tests = [t for t in tests
              if self._IsTestValidForSdkRange(t, min_sdk_version)]
 
     return tests
 
   @staticmethod
   def IsHostDrivenTest(test):
     return 'pythonDrivenTests' in test