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

webkit/fileapi/file_system_file_util_proxy.cc

Index: webkit/fileapi/file_system_file_util_proxy.cc
diff --git a/webkit/fileapi/file_system_file_util_proxy.cc b/webkit/fileapi/file_system_file_util_proxy.cc
index d7caf8e52b254b232bdcb836891f6e6ef4bf5f33..35c08bf9c0fb06bfdfe6c0e502c6bf29560e2866 100644
--- a/webkit/fileapi/file_system_file_util_proxy.cc
+++ b/webkit/fileapi/file_system_file_util_proxy.cc
@@ -150,46 +150,44 @@ bool FileSystemFileUtilProxy::CreateOrOpen(
 }
 
 // static
-bool FileSystemFileUtilProxy::Copy(
+bool FileSystemFileUtilProxy::CopyFileLocal(
     FileSystemOperationContext* context,
-    FileSystemFileUtil* src_util,
-    FileSystemFileUtil* dest_util,
+    FileSystemFileUtil* file_util,
     const FileSystemURL& src_url,
     const FileSystemURL& dest_url,
     const StatusCallback& callback) {
   return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
-      Bind(&FileUtilHelper::Copy,
-           context, src_util, dest_util, src_url, dest_url),
+      Bind(&FileSystemFileUtil::CopyOrMoveFile, Unretained(file_util),
+           context, src_url, dest_url, true /* copy */),
       callback);
 }
 
 // static
-bool FileSystemFileUtilProxy::CopyInForeignFile(
+bool FileSystemFileUtilProxy::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) {
   return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
-      Bind(&FileSystemFileUtil::CopyInForeignFile, Unretained(dest_util),
-           context, src_local_disk_file_path, dest_url),
+      Bind(&FileSystemFileUtil::CopyOrMoveFile, Unretained(file_util),
+           context, src_url, dest_url, false /* copy */),
       callback);
 }
 
 // static
-bool FileSystemFileUtilProxy::Move(
+bool FileSystemFileUtilProxy::CopyInForeignFile(
     FileSystemOperationContext* context,
-      FileSystemFileUtil* src_util,
-      FileSystemFileUtil* dest_util,
-      const FileSystemURL& src_url,
-      const FileSystemURL& dest_url,
+    FileSystemFileUtil* file_util,
+    const FilePath& src_local_disk_file_path,
+    const FileSystemURL& dest_url,
     const StatusCallback& callback) {
   return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
-      Bind(&FileUtilHelper::Move,
-           context, src_util, dest_util, src_url, dest_url),
+      Bind(&FileSystemFileUtil::CopyInForeignFile, Unretained(file_util),
+           context, src_local_disk_file_path, dest_url),
       callback);
 }