[Android] Switch to DeviceUtils versions of file functions.

build/android/pylib/android_commands.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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 1036 matching lines @@
 
   def PushIfNeeded(self, host_path, device_path):
     """Pushes |host_path| to |device_path|.
 
     Works for files and directories. This method skips copying any paths in
     |test_data_paths| that already exist on the device with the same hash.
 
     All pushed files can be removed by calling RemovePushedFiles().
     """
     MAX_INDIVIDUAL_PUSHES = 50
-    assert os.path.exists(host_path), 'Local path not found %s' % host_path
+    if not os.path.exists(host_path):
+      raise device_errors.CommandFailedError(
+          'Local path not found %s' % host_path, device=str(self))
 
     # See if the file on the host changed since the last push (if any) and
     # return early if it didn't. Note that this shortcut assumes that the tests
     # on the device don't modify the files.
     if not os.path.isdir(host_path):
       if host_path in self._push_if_needed_cache:
         host_path_mtime = self._push_if_needed_cache[host_path]
         if host_path_mtime == os.stat(host_path).st_mtime:
           return
 
@@ skipping 35 matching lines @@
 
     diff_size = 0
     if len(changed_files) <= MAX_INDIVIDUAL_PUSHES:
       diff_size = sum(host_utils.GetRecursiveDiskUsage(f[0])
                       for f in changed_files)
 
     # TODO(craigdh): Replace this educated guess with a heuristic that
     # approximates the push time for each method.
     if len(changed_files) > MAX_INDIVIDUAL_PUSHES or diff_size > 0.5 * size:
       self._actual_push_size += size
-      if os.path.isdir(host_path):
-        self.RunShellCommand('mkdir -p %s' % device_path)
       Push(host_path, device_path)
     else:
       for f in changed_files:
         Push(f[0], f[1])
       self._actual_push_size += diff_size
 
   def GetPushSizeInfo(self):
     """Get total size of pushes to the device done via PushIfNeeded()
 
     Returns:
@@ skipping 651 matching lines @@
     self.RunShellCommand('rm -f "%s"' % device_file)
     return host_file
 
   def PullFileFromDevice(self, device_file, host_file):
     """Download |device_file| on the device from to |host_file| on the host.
 
     Args:
       device_file: Absolute path to the file to retrieve from the device.
       host_file: Absolute path to the file to store on the host.
     """
-    assert self._adb.Pull(device_file, host_file)
+    if not self._adb.Pull(device_file, host_file):
+      raise device_errors.AdbCommandFailedError(
+          ['pull', device_file, host_file], 'Failed to pull file from device.')
     assert os.path.exists(host_file)
 
   def SetUtilWrapper(self, util_wrapper):
     """Sets a wrapper prefix to be used when running a locally-built
     binary on the device (ex.: md5sum_bin).
     """
     self._util_wrapper = util_wrapper
 
   def RunInstrumentationTest(self, test, test_package, instr_args, timeout):
     """Runs a single instrumentation test.
@@ skipping 169 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()