[Android] Switch to DeviceUtils version of RunShellCommand.

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 66 matching lines @@
   local_props = [
       'ro.monkey=1',
       'ro.test_harness=1',
       'ro.audio.silent=1',
       'ro.setupwizard.mode=DISABLED',
       ]
   device.old_interface.SetProtectedFileContents(
       constants.DEVICE_LOCAL_PROPERTIES_PATH,
       '\n'.join(local_props))
   # Android will not respect the local props file if it is world writable.
-  device.old_interface.RunShellCommandWithSU(
-      'chmod 644 %s' % constants.DEVICE_LOCAL_PROPERTIES_PATH)
+  device.RunShellCommand(
+      'chmod 644 %s' % constants.DEVICE_LOCAL_PROPERTIES_PATH,
+      root=True)
 
   # LOCAL_PROPERTIES_PATH = '/data/local.prop'
 
 
 def WipeDeviceData(device):
   """Wipes data from device, keeping only the adb_keys for authorization.
 
   After wiping data on a device that has been authorized, adb can still
   communicate with the device, but after reboot the device will need to be
   re-authorized because the adb keys file is stored in /data/misc/adb/.
   Thus, adb_keys file is rewritten so the device does not need to be
   re-authorized.
 
   Arguments:
     device: the device to wipe
   """
   device_authorized = device.old_interface.FileExistsOnDevice(
       constants.ADB_KEYS_FILE)
   if device_authorized:
-    adb_keys = device.old_interface.RunShellCommandWithSU(
-      'cat %s' % constants.ADB_KEYS_FILE)
-  device.old_interface.RunShellCommandWithSU('wipe data')
+    adb_keys = device.RunShellCommand('cat %s' % constants.ADB_KEYS_FILE,
+                                      root=True)
+  device.RunShellCommand('wipe data', root=True)
   if device_authorized:
     path_list = constants.ADB_KEYS_FILE.split('/')
     dir_path = '/'.join(path_list[:len(path_list)-1])
-    device.old_interface.RunShellCommandWithSU('mkdir -p %s' % dir_path)
-    device.old_interface.RunShellCommand('echo %s > %s' %
-                                         (adb_keys[0], constants.ADB_KEYS_FILE))
+    device.RunShellCommand('mkdir -p %s' % dir_path, root=True)
+    device.RunShellCommand('echo %s > %s' %
+                           (adb_keys[0], constants.ADB_KEYS_FILE))
     for adb_key in adb_keys[1:]:
-      device.old_interface.RunShellCommand(
+      device.RunShellCommand(
         'echo %s >> %s' % (adb_key, constants.ADB_KEYS_FILE))
 
 
 def ProvisionDevices(options):
   # TODO(jbudorick): Parallelize provisioning of all attached devices after
-  # swithcing from AndroidCommands.
+  # switching from AndroidCommands.
   if options.device is not None:
     devices = [options.device]
   else:
     devices = android_commands.GetAttachedDevices()
 
   # Wipe devices (unless --skip-wipe was specified)
   if not options.skip_wipe:
     for device_serial in devices:
       device = device_utils.DeviceUtils(device_serial)
       device.old_interface.EnableAdbRoot()
       WipeDeviceData(device)
     try:
-      device_utils.DeviceUtils.parallel(devices).old_interface.Reboot(True)
+      device_utils.DeviceUtils.parallel(devices).Reboot(True)
     except errors.DeviceUnresponsiveError:
       pass
     for device_serial in devices:
       device.WaitUntilFullyBooted(timeout=90)
 
   # Provision devices
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.old_interface.EnableAdbRoot()
     _ConfigureLocalProperties(device)
@@ skipping 18 matching lines @@
         if not device.old_interface.IsDeviceCharging():
           if device.old_interface.CanControlUsbCharging():
             device.old_interface.EnableUsbCharging()
           else:
             logging.error('Device is not charging')
             break
         logging.info('Waiting for device to charge. Current level=%s',
                      battery_info.get('level', 0))
         time.sleep(60)
         battery_info = device.old_interface.GetBatteryInfo()
-    device.old_interface.RunShellCommandWithSU('date -u %f' % time.time())
+    device.RunShellCommand('date -u %f' % time.time(), root=True)
   try:
     device_utils.DeviceUtils.parallel(devices).Reboot(True)
   except errors.DeviceUnresponsiveError:
     pass
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.WaitUntilFullyBooted(timeout=90)
     (_, props) = device.old_interface.GetShellCommandStatusAndOutput('getprop')
     for prop in props:
       print prop
@@ skipping 18 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))