[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/pylib/gtest/test_package_apk.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.
 
 """Defines TestPackageApk to help run APK-based native tests."""
 # pylint: disable=W0212
 
 import logging
 import os
 import shlex
@@ skipping 37 matching lines @@
         self._package_info.cmdline_file)
 
   def _GetFifo(self):
     # The test.fifo path is determined by:
     # testing/android/java/src/org/chromium/native_test/
     #     ChromeNativeTestActivity.java and
     # testing/android/native_test_launcher.cc
     return '/data/data/' + self._package_info.package + '/files/test.fifo'
 
   def _ClearFifo(self, device):
-    device.old_interface.RunShellCommand('rm -f ' + self._GetFifo())
+    device.RunShellCommand('rm -f ' + self._GetFifo())
 
   def _WatchFifo(self, device, timeout, logfile=None):
     for i in range(10):
       if device.old_interface.FileExistsOnDevice(self._GetFifo()):
         logging.info('Fifo created.')
         break
       time.sleep(i)
     else:
       raise device_errors.DeviceUnreachableError(
           'Unable to find fifo on device %s ' % self._GetFifo())
@@ skipping 10 matching lines @@
         action='android.intent.action.MAIN',
         force_stop=True)
 
   #override
   def ClearApplicationState(self, device):
     device.old_interface.ClearApplicationState(self._package_info.package)
     # Content shell creates a profile on the sdscard which accumulates cache
     # files over time.
     if self.suite_name == 'content_browsertests':
       try:
-        device.old_interface.RunShellCommand(
+        device.RunShellCommand(
             'rm -r %s/content_shell' % device.GetExternalStoragePath(),
-            timeout_time=60 * 2)
+            timeout=60 * 2)
       except device_errors.CommandFailedError:
         # TODO(jbudorick) Handle this exception appropriately once the
         #                 conversions are done.
         pass
 
   #override
   def CreateCommandLineFileOnDevice(self, device, test_filter, test_arguments):
     self._CreateCommandLineFileOnDevice(
         device, '--gtest_filter=%s %s' % (test_filter, test_arguments))
 
@@ skipping 23 matching lines @@
       self._StartActivity(device)
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(device, timeout=10, logfile=logfile)
 
   #override
   def Install(self, device):
     self.tool.CopyFiles()
     device.Install(self.suite_path)