(For-try) Divide recursive Copy/Move into multiple async tasks

webkit/fileapi/file_system_file_util_proxy.cc

 // 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.
 
 #include "webkit/fileapi/file_system_file_util_proxy.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
@@ skipping 90 matching lines @@
 
  private:
   base::PlatformFileError error_;
   std::vector<Proxy::Entry> entries_;
   DISALLOW_COPY_AND_ASSIGN(ReadDirectoryHelper);
 };
 
 }  // namespace
 
 // static
-bool FileSystemFileUtilProxy::Delete(
+bool FileSystemFileUtilProxy::DeleteFile(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
-    bool recursive,
     const StatusCallback& callback) {
   return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
-      Bind(&FileUtilHelper::Delete, context, file_util, url, recursive),
+      Bind(&FileSystemFileUtil::DeleteFile, Unretained(file_util),
+           context, url),
       callback);
 }
 
+// static
+bool FileSystemFileUtilProxy::DeleteDirectory(
+    FileSystemOperationContext* context,
+    FileSystemFileUtil* file_util,
+    const FileSystemURL& url,
+    const StatusCallback& callback) {
+  return base::PostTaskAndReplyWithResult(
+      context->task_runner(), FROM_HERE,
+      Bind(&FileSystemFileUtil::DeleteDirectory, Unretained(file_util),
+           context, url),
+      callback);
+}
+
 // static
 bool FileSystemFileUtilProxy::CreateOrOpen(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     int file_flags,
     const CreateOrOpenCallback& callback) {
   return base::FileUtilProxy::RelayCreateOrOpen(
       context->task_runner(),
       Bind(&FileSystemFileUtil::CreateOrOpen, Unretained(file_util),
            context, url, file_flags),
       Bind(&FileSystemFileUtil::Close, Unretained(file_util),
            context),
       callback);
 }
 
 // static
-bool FileSystemFileUtilProxy::Copy(
+bool FileSystemFileUtilProxy::CopyLocalFile(
     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::MoveLocalFile(
+    FileSystemOperationContext* context,
+    FileSystemFileUtil* file_util,
+    const FileSystemURL& src_url,
+    const FileSystemURL& dest_url,
+    const StatusCallback& callback) {
+  return base::PostTaskAndReplyWithResult(
+      context->task_runner(), FROM_HERE,
+      Bind(&FileSystemFileUtil::CopyOrMoveFile, Unretained(file_util),
+           context, src_url, dest_url, false /* copy */),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::CopyInForeignFile(
     FileSystemOperationContext* context,
-    FileSystemFileUtil* dest_util,
+    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(&FileSystemFileUtil::CopyInForeignFile, Unretained(dest_util),
+      Bind(&FileSystemFileUtil::CopyInForeignFile, Unretained(file_util),
            context, src_local_disk_file_path, dest_url),
       callback);
 }
 
-// static
-bool FileSystemFileUtilProxy::Move(
-    FileSystemOperationContext* context,
-      FileSystemFileUtil* src_util,
-      FileSystemFileUtil* dest_util,
-      const FileSystemURL& src_url,
-      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),
-      callback);
-}
-
 // static
 bool FileSystemFileUtilProxy::EnsureFileExists(
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemURL& url,
     const EnsureFileExistsCallback& callback) {
   EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
   return context->task_runner()->PostTaskAndReply(
         FROM_HERE,
         Bind(&EnsureFileExistsHelper::RunWork, Unretained(helper),
@@ skipping 81 matching lines @@
     int64 length,
     const StatusCallback& callback) {
   return base::PostTaskAndReplyWithResult(
       context->task_runner(), FROM_HERE,
       Bind(&FileSystemFileUtil::Truncate, Unretained(file_util),
            context, url, length),
       callback);
 }
 
 }  // namespace fileapi