| Index: build/android/pylib/host_driven/test_case.py
 | 
| diff --git a/build/android/pylib/host_driven/test_case.py b/build/android/pylib/host_driven/test_case.py
 | 
| index 8c372cda54d9c62c7e222e08275902f8fdec7f39..a7c6a18f011c7c124b7a9e3b11bc0b203fd4d379 100644
 | 
| --- a/build/android/pylib/host_driven/test_case.py
 | 
| +++ b/build/android/pylib/host_driven/test_case.py
 | 
| @@ -50,8 +50,6 @@ class HostDrivenTestCase(object):
 | 
|        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
 | 
| @@ -67,15 +65,12 @@ class HostDrivenTestCase(object):
 | 
|  
 | 
|    # TODO(bulach): make ports_to_forward not optional and move the Forwarder
 | 
|    # mapping here.
 | 
| -  def SetUp(self, device, shard_index,
 | 
| -            cleanup_test_files, ports_to_forward=None):
 | 
| +  def SetUp(self, device, shard_index, 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
 | 
|  
 | 
| 
 |