Split recursive Copy/Move into async tasks and support cross operation (in local case)

webkit/fileapi/file_system_file_util_proxy.h

Index: webkit/fileapi/file_system_file_util_proxy.h
diff --git a/webkit/fileapi/file_system_file_util_proxy.h b/webkit/fileapi/file_system_file_util_proxy.h
index 560ed6d1344b79811b3dead7d232bb7d85bcd35e..3c43e30bc43edf448ba6da59257cffc4acb3d7aa 100644
--- a/webkit/fileapi/file_system_file_util_proxy.h
+++ b/webkit/fileapi/file_system_file_util_proxy.h
@@ -64,48 +64,28 @@ class FileSystemFileUtilProxy {
       int file_flags,
       const CreateOrOpenCallback& callback);
 
-  // Copies a file or a directory from |src_url| to |dest_url| by calling
-  // FileSystemFileUtil's following methods on the given context's
-  // task_runner.
-  // - CopyOrMoveFile() for same-filesystem operations
-  // - CopyInForeignFile() for (limited) cross-filesystem operations
-  //
-  // Error cases:
-  // If destination's parent doesn't exist.
-  // If source dir exists but destination url is an existing file.
-  // If source file exists but destination url is an existing directory.
-  // If source is a parent of destination.
-  // If source doesn't exist.
-  // If source and dest are the same url in the same filesystem.
-  static bool Copy(
+  // Copies a local file or a directory from |src_url| to |dest_url|.
+  static bool CopyFileLocal(
       FileSystemOperationContext* context,
-      FileSystemFileUtil* src_util,
-      FileSystemFileUtil* dest_util,
+      FileSystemFileUtil* file_util,
       const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       const StatusCallback& callback);
 
-  // Copies a file from local disk to the given filesystem destination.
-  // Primarily used for the Syncable filesystem type (e.g. GDrive).
-  static bool CopyInForeignFile(
+  // Moves a local file or a directory from |src_url| to |dest_url|.
+  static bool MoveFileLocal(
       FileSystemOperationContext* context,
-      FileSystemFileUtil* dest_util,
-      const FilePath& src_local_disk_file_path,
+      FileSystemFileUtil* file_util,
+      const FileSystemURL& src_url,
       const FileSystemURL& dest_url,
       const StatusCallback& callback);
 
-  // Moves a file or a directory from |src_url| to |dest_url| by calling
-  // FileSystemFileUtil's following methods on the given context's
-  // task_runner.
-  // - CopyOrMoveFile() for same-filesystem operations
-  // - CopyInForeignFile() for (limited) cross-filesystem operations
-  //
-  // This method returns an error on the same error cases with Copy.
-  static bool Move(
+  // Copies a file from local disk to the given filesystem destination.
+  // Primarily used for the Syncable filesystem type (e.g. GDrive).
+  static bool CopyInForeignFile(
       FileSystemOperationContext* context,
-      FileSystemFileUtil* src_util,
-      FileSystemFileUtil* dest_util,
-      const FileSystemURL& src_url,
+      FileSystemFileUtil* file_util,
+      const FilePath& src_local_disk_file_path,
       const FileSystemURL& dest_url,
       const StatusCallback& callback);