Use RelayFileTask instead of CopyOrMoveHelper

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/message_loop_proxy.h"
 #include "webkit/fileapi/cross_file_util_helper.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 
 namespace fileapi {
 
 using base::Bind;
 using base::Callback;
 using base::Owned;
 using base::PlatformFileError;
 using base::Unretained;
 
 namespace {
 
 typedef fileapi::FileSystemFileUtilProxy Proxy;
 
-class CopyOrMoveHelper {
- public:
-  CopyOrMoveHelper(CrossFileUtilHelper* helper)
-      : helper_(helper),
-        error_(base::PLATFORM_FILE_OK) {}
-  ~CopyOrMoveHelper() {}
-
-  void RunWork() {
-    error_ = helper_->DoWork();
-  }
-
-  void Reply(const Proxy::StatusCallback& callback) {
-    if (!callback.is_null())
-      callback.Run(error_);
-  }
-
- private:
-  scoped_ptr<CrossFileUtilHelper> helper_;
-  base::PlatformFileError error_;
-  DISALLOW_COPY_AND_ASSIGN(CopyOrMoveHelper);
-};
-
 class EnsureFileExistsHelper {
  public:
   EnsureFileExistsHelper() : error_(base::PLATFORM_FILE_OK), created_(false) {}
 
   void RunWork(FileSystemFileUtil* file_util,
                FileSystemOperationContext* context,
                const FileSystemPath& path) {
     error_ = file_util->EnsureFileExists(context, path, &created_);
   }
 
@@ skipping 88 matching lines @@
 
 // static
 bool FileSystemFileUtilProxy::Copy(
     MessageLoopProxy* message_loop_proxy,
     FileSystemOperationContext* context,
     FileSystemFileUtil* src_util,
     FileSystemFileUtil* dest_util,
     const FileSystemPath& src_path,
     const FileSystemPath& dest_path,
     const StatusCallback& callback) {
-  CopyOrMoveHelper* helper = new CopyOrMoveHelper(
+  CrossFileUtilHelper* helper =
       new CrossFileUtilHelper(
           context, src_util, dest_util, src_path, dest_path,
-          CrossFileUtilHelper::OPERATION_COPY));
-  return message_loop_proxy->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&CopyOrMoveHelper::RunWork, Unretained(helper)),
-        Bind(&CopyOrMoveHelper::Reply, Owned(helper), callback));
+          CrossFileUtilHelper::OPERATION_COPY);
+
+  return base::FileUtilProxy::RelayFileTask(
+      message_loop_proxy, FROM_HERE,
+      Bind(&CrossFileUtilHelper::DoWork, Owned(helper)),
+      callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::Move(
     MessageLoopProxy* message_loop_proxy,
     FileSystemOperationContext* context,
       FileSystemFileUtil* src_util,
       FileSystemFileUtil* dest_util,
       const FileSystemPath& src_path,
       const FileSystemPath& dest_path,
     const StatusCallback& callback) {
-  CopyOrMoveHelper* helper = new CopyOrMoveHelper(
+  CrossFileUtilHelper* helper =
       new CrossFileUtilHelper(
           context, src_util, dest_util, src_path, dest_path,
-          CrossFileUtilHelper::OPERATION_MOVE));
-  return message_loop_proxy->PostTaskAndReply(
-        FROM_HERE,
-        Bind(&CopyOrMoveHelper::RunWork, Unretained(helper)),
-        Bind(&CopyOrMoveHelper::Reply, Owned(helper), callback));
+          CrossFileUtilHelper::OPERATION_MOVE);
+  return base::FileUtilProxy::RelayFileTask(
+      message_loop_proxy, FROM_HERE,
+      Bind(&CrossFileUtilHelper::DoWork, Owned(helper)),
+      callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::EnsureFileExists(
     MessageLoopProxy* message_loop_proxy,
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemPath& path,
     const EnsureFileExistsCallback& callback) {
   EnsureFileExistsHelper* helper = new EnsureFileExistsHelper;
@@ skipping 76 matching lines @@
     int64 length,
     const StatusCallback& callback) {
   return base::FileUtilProxy::RelayFileTask(
       message_loop_proxy, FROM_HERE,
       base::Bind(&FileSystemFileUtil::Truncate, base::Unretained(file_util),
                  context, path, length),
       callback);
 }
 
 }  // namespace fileapi