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

build/android/pylib/host_driven/test_case.py

 # Copyright 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.
 
 """Base class for host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
@@ skipping 137 matching lines @@
     log = ''
 
     test_pkg = test_package.TestPackage(
         self.instrumentation_options.test_apk_path,
         self.instrumentation_options.test_apk_jar_path,
         self.instrumentation_options.test_support_apk_path)
 
     start_ms = int(time.time()) * 1000
     done = False
     for test_filter in test_filters:
-      tests = test_pkg.GetAllMatchingTests(
-          None, None, test_filter, [self.device])
+      tests = test_pkg.GetAllMatchingTests(None, None, test_filter)
       # Filters should always result in >= 1 test.
       if len(tests) == 0:
         raise Exception('Java test filter "%s" returned no tests.'
                         % test_filter)
       for test in tests:
         # We're only running one test at a time, so this TestRunResults object
         # will hold only one result.
         java_result = self.__RunJavaTest(test, test_pkg, additional_flags)
         assert len(java_result.GetAll()) == 1
         if not java_result.DidRunPass():
@@ skipping 11 matching lines @@
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name