| Index: build/android/pylib/gtest/test_package_apk.py
|
| diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py
|
| index 83b6b001931da392fe2aa84777e983f5ff3c2706..f4315267ff44394a71e36bab6a261eb02a22b32a 100644
|
| --- a/build/android/pylib/gtest/test_package_apk.py
|
| +++ b/build/android/pylib/gtest/test_package_apk.py
|
| @@ -55,7 +55,7 @@ class TestPackageApk(TestPackage):
|
| 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):
|
| @@ -86,9 +86,9 @@ class TestPackageApk(TestPackage):
|
| # 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.
|
|
|