Merge CrossFileUtilHelper to FileUtilHelper as Copy() and Move().

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"
 #include "webkit/fileapi/file_util_helper.h"
 
 namespace fileapi {
 
 using base::Bind;
 using base::Callback;
 using base::Owned;
 using base::PlatformFileError;
@@ skipping 103 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) {
-  CrossFileUtilHelper* helper =
-      new CrossFileUtilHelper(
-          context, src_util, dest_util, src_path, dest_path,
-          CrossFileUtilHelper::OPERATION_COPY);
-
   return base::FileUtilProxy::RelayFileTask(
       message_loop_proxy, FROM_HERE,
-      Bind(&CrossFileUtilHelper::DoWork, Owned(helper)),
+      Bind(&FileUtilHelper::Copy,
+           context, src_util, dest_util, src_path, dest_path),
       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) {
-  CrossFileUtilHelper* helper =
-      new CrossFileUtilHelper(
-          context, src_util, dest_util, src_path, dest_path,
-          CrossFileUtilHelper::OPERATION_MOVE);
   return base::FileUtilProxy::RelayFileTask(
       message_loop_proxy, FROM_HERE,
-      Bind(&CrossFileUtilHelper::DoWork, Owned(helper)),
+      Bind(&FileUtilHelper::Move,
+           context, src_util, dest_util, src_path, dest_path),
       callback);
 }
 
 // static
 bool FileSystemFileUtilProxy::EnsureFileExists(
     MessageLoopProxy* message_loop_proxy,
     FileSystemOperationContext* context,
     FileSystemFileUtil* file_util,
     const FileSystemPath& path,
     const EnsureFileExistsCallback& callback) {
@@ skipping 76 matching lines @@
     int64 length,
     const StatusCallback& callback) {
   return base::FileUtilProxy::RelayFileTask(
       message_loop_proxy, FROM_HERE,
       Bind(&FileSystemFileUtil::Truncate, Unretained(file_util),
            context, path, length),
       callback);
 }
 
 }  // namespace fileapi