Revert of [Android] Reland cleanup of old_interface in build/android/pylib.

build/android/pylib/host_driven/test_runner.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.
 
 """Runs host-driven tests on a particular device."""
 
 import logging
 import sys
 import time
 import traceback
@@ skipping 29 matching lines @@
         log=str(exc_type) + ' ' + log_msg)
 
 
 class HostDrivenTestRunner(base_test_runner.BaseTestRunner):
   """Orchestrates running a set of host-driven tests.
 
   Any Python exceptions in the tests are caught and translated into a failed
   result, rather than being re-raised on the main thread.
   """
 
-  # TODO(jbudorick): Remove cleanup_test_files once it's no longer used.
-  # pylint: disable=unused-argument
   #override
-  def __init__(self, device, shard_index, tool, cleanup_test_files=None):
+  def __init__(self, device, shard_index, tool, cleanup_test_files):
     """Creates a new HostDrivenTestRunner.
 
     Args:
       device: Attached android device.
       shard_index: Shard index.
       tool: Name of the Valgrind tool.
-      cleanup_test_files: Deprecated.
+      cleanup_test_files: Whether or not to cleanup test files on device.
     """
 
-    super(HostDrivenTestRunner, self).__init__(device, tool)
+    super(HostDrivenTestRunner, self).__init__(device, tool, cleanup_test_files)
 
     # The shard index affords the ability to create unique port numbers (e.g.
     # DEFAULT_PORT + shard_index) if the test so wishes.
     self.shard_index = shard_index
 
-  # pylint: enable=unused-argument
-
   #override
   def RunTest(self, test):
     """Sets up and runs a test case.
 
     Args:
       test: An object which is ostensibly a subclass of HostDrivenTestCase.
 
     Returns:
       A TestRunResults object which contains the result produced by the test
       and, in the case of a failure, the test that should be retried.
     """
 
     assert isinstance(test, test_case.HostDrivenTestCase)
 
     start_date_ms = int(time.time()) * 1000
     exception_raised = False
 
     try:
-      test.SetUp(str(self.device), self.shard_index)
+      test.SetUp(str(self.device), self.shard_index, self._cleanup_test_files)
     except Exception:
       logging.exception(
           'Caught exception while trying to run SetUp() for test: ' +
           test.tagged_name)
       # Tests whose SetUp() method has failed are likely to fail, or at least
       # yield invalid results.
       exc_info = sys.exc_info()
       results = base_test_result.TestRunResults()
       results.AddResult(HostDrivenExceptionTestResult(
           test.tagged_name, start_date_ms, exc_info))
@@ skipping 24 matching lines @@
         # until the test is fixed.
         exc_info = sys.exc_info()
         results = base_test_result.TestRunResults()
         results.AddResult(HostDrivenExceptionTestResult(
             test.tagged_name, start_date_ms, exc_info))
 
     if not results.DidRunPass():
       return results, test
     else:
       return results, None