[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import sys
@@ skipping 136 matching lines @@
   def SetUp(self):
     """Sets up the test harness and device before all tests are run."""
     super(TestRunner, self).SetUp()
     if not self.device.HasRoot():
       logging.warning('Unable to enable java asserts for %s, non rooted device',
                       str(self.device))
     else:
       if self.device.old_interface.SetJavaAssertsEnabled(True):
         # TODO(jbudorick) How to best do shell restart after the
         #                 android_commands refactor?
-        self.device.old_interface.RunShellCommand('stop')
-        self.device.old_interface.RunShellCommand('start')
+        self.device.RunShellCommand('stop')
+        self.device.RunShellCommand('start')
 
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     self.LaunchTestHttpServer(
         os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.flags:
       self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
 
   def TearDown(self):
@@ skipping 61 matching lines @@
 
     # The logic below relies on the test passing.
     if not raw_result or raw_result.GetStatusCode():
       return
 
     self.TearDownPerfMonitoring(test)
 
     if self.coverage_dir:
       self.device.old_interface.Adb().Pull(
           self.coverage_device_file, self.coverage_host_file)
-      self.device.old_interface.RunShellCommand(
+      self.device.RunShellCommand(
           'rm -f %s' % self.coverage_device_file)
 
   def TearDownPerfMonitoring(self, test):
     """Cleans up performance monitoring if the specified test required it.
 
     Args:
       test: The name of the test that was just run.
     Raises:
       Exception: if there's anything wrong with the perf data.
     """
@@ skipping 135 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)