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

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 32 matching lines @@
   _HOST_DRIVEN_TAG = 'HostDriven'
 
   def __init__(self, test_name, instrumentation_options=None):
     """Create a test case initialized to run |test_name|.
 
     Args:
       test_name: The name of the method to run as the test.
       instrumentation_options: An InstrumentationOptions object.
     """
     class_name = self.__class__.__name__
+    self.adb = None
+    self.cleanup_test_files = False
     self.device = None
     self.device_id = ''
     self.has_forwarded_ports = False
     self.instrumentation_options = instrumentation_options
     self.ports_to_forward = []
     self.shard_index = 0
 
     # Use tagged_name when creating results, so that we can identify host-driven
     # tests in the overall results.
     self.test_name = test_name
     self.qualified_name = '%s.%s' % (class_name, self.test_name)
     self.tagged_name = '%s_%s' % (self._HOST_DRIVEN_TAG, self.qualified_name)
 
   # TODO(bulach): make ports_to_forward not optional and move the Forwarder
   # mapping here.
-  def SetUp(self, device, shard_index, ports_to_forward=None):
+  def SetUp(self, device, shard_index,
+            cleanup_test_files, ports_to_forward=None):
     if not ports_to_forward:
       ports_to_forward = []
     self.device_id = device
     self.shard_index = shard_index
     self.device = device_utils.DeviceUtils(self.device_id)
+    self.adb = self.device.old_interface
+    self.cleanup_test_files = cleanup_test_files
     if ports_to_forward:
       self.ports_to_forward = ports_to_forward
 
   def TearDown(self):
     pass
 
   # TODO(craigdh): Remove GetOutDir once references have been removed
   # downstream.
   @staticmethod
   def GetOutDir():
@@ skipping 97 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