[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/pylib/valgrind_tools.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.
 
 """
 Classes in this file define additional actions that need to be taken to run a
 test under some kind of runtime error detection tool.
 
 The interface is intended to be used as follows.
 
@@ skipping 19 matching lines @@
 
 from pylib.constants import DIR_SOURCE_ROOT
 from pylib.device import device_errors
 
 
 def SetChromeTimeoutScale(device, scale):
   """Sets the timeout scale in /data/local/tmp/chrome_timeout_scale to scale."""
   path = '/data/local/tmp/chrome_timeout_scale'
   if not scale or scale == 1.0:
     # Delete if scale is None/0.0/1.0 since the default timeout scale is 1.0
-    device.old_interface.RunShellCommand('rm %s' % path)
+    device.RunShellCommand('rm %s' % path)
   else:
     device.old_interface.SetProtectedFileContents(path, '%f' % scale)
 
 
 class BaseTool(object):
   """A tool that does nothing."""
 
   def __init__(self):
     """Does nothing."""
     pass
@@ skipping 108 matching lines @@
 
   def __init__(self, device):
     super(ValgrindTool, self).__init__()
     self._device = device
     # exactly 31 chars, SystemProperties::PROP_NAME_MAX
     self._wrap_properties = ['wrap.com.google.android.apps.ch',
                              'wrap.org.chromium.native_test']
 
   def CopyFiles(self):
     """Copies Valgrind tools to the device."""
-    self._device.old_interface.RunShellCommand(
+    self._device.RunShellCommand(
         'rm -r %s; mkdir %s' % (ValgrindTool.VG_DIR, ValgrindTool.VG_DIR))
-    self._device.old_interface.RunShellCommand(
+    self._device.RunShellCommand(
         'rm -r %s; mkdir %s' % (ValgrindTool.VGLOGS_DIR,
                                 ValgrindTool.VGLOGS_DIR))
     files = self.GetFilesForTool()
     for f in files:
       self._device.old_interface.PushIfNeeded(
           os.path.join(DIR_SOURCE_ROOT, f),
           os.path.join(ValgrindTool.VG_DIR, os.path.basename(f)))
 
   def SetupEnvironment(self):
     """Sets up device environment."""
-    self._device.old_interface.RunShellCommand('chmod 777 /data/local/tmp')
-    self._device.old_interface.RunShellCommand('setenforce 0')
+    self._device.RunShellCommand('chmod 777 /data/local/tmp')
+    self._device.RunShellCommand('setenforce 0')
     for prop in self._wrap_properties:
-      self._device.old_interface.RunShellCommand(
+      self._device.RunShellCommand(
           'setprop %s "logwrapper %s"' % (prop, self.GetTestWrapper()))
     SetChromeTimeoutScale(self._device, self.GetTimeoutScale())
 
   def CleanUpEnvironment(self):
     """Cleans up device environment."""
     for prop in self._wrap_properties:
-      self._device.old_interface.RunShellCommand('setprop %s ""' % (prop,))
+      self._device.RunShellCommand('setprop %s ""' % (prop,))
     SetChromeTimeoutScale(self._device, None)
 
   def GetFilesForTool(self):
     """Returns a list of file names for the tool."""
     raise NotImplementedError()
 
   def NeedsDebugInfo(self):
     """Whether this tool requires debug info.
 
     Returns:
@@ skipping 66 matching lines @@
   if not tool_name:
     return BaseTool()
 
   ctor = TOOL_REGISTRY.get(tool_name)
   if ctor:
     return ctor(device)
   else:
     print 'Unknown tool %s, available tools: %s' % (
         tool_name, ', '.join(sorted(TOOL_REGISTRY.keys())))
     sys.exit(1)