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

build/android/pylib/perf/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 perf tests.
 
 Our buildbot infrastructure requires each slave to run steps serially.
 This is sub-optimal for android, where these steps can run independently on
 multiple connected devices.
 
@@ skipping 152 matching lines @@
     """A TestRunner instance runs a perf test on a single device.
 
     Args:
       test_options: A PerfOptions object.
       device: Device to run the tests.
       shard_index: the index of this device.
       max_shards: the maximum shard index.
       tests: a dict mapping test_name to command.
       flaky_tests: a list of flaky test_name.
     """
-    super(TestRunner, self).__init__(device, None)
+    super(TestRunner, self).__init__(device, None, 'Release')
     self._options = test_options
     self._shard_index = shard_index
     self._max_shard = max_shard
     self._tests = tests
     self._flaky_tests = flaky_tests
     self._output_dir = None
 
   @staticmethod
   def _IsBetter(result):
     if result['actual_exit_code'] == 0:
@@ skipping 44 matching lines @@
 
     Returns:
       A tuple containing (Output, base_test_result.ResultType)
     """
     if not self._CheckDeviceAffinity(test_name):
       return '', base_test_result.ResultType.PASS
 
     try:
       logging.warning('Unmapping device ports')
       forwarder.Forwarder.UnmapAllDevicePorts(self.device)
-      self.device.RestartAdbd()
+      self.device.old_interface.RestartAdbdOnDevice()
     except Exception as e:
       logging.error('Exception when tearing down device %s', e)
 
     cmd = ('%s --device %s' %
            (self._tests['steps'][test_name]['cmd'],
             self.device_serial))
 
     if self._options.collect_chartjson_data:
       self._output_dir = tempfile.mkdtemp()
       cmd = cmd + ' --output-dir=%s' % self._output_dir
@@ skipping 80 matching lines @@
     Returns:
       A tuple of (TestRunResults, retry).
     """
     _, result_type = self._LaunchPerfTest(test_name)
     results = base_test_result.TestRunResults()
     results.AddResult(base_test_result.BaseTestResult(test_name, result_type))
     retry = None
     if not results.DidRunPass():
       retry = test_name
     return results, retry