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

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 52b0fd54e0d8fa4c90f0ce2a1bb72a3fa17c4d99..6301d6ca640f1ad75ca5366c1c0f3f2ae4b2889e 100644
--- a/webkit/fileapi/file_system_file_util_proxy.cc
+++ b/webkit/fileapi/file_system_file_util_proxy.cc
@@ -7,7 +7,6 @@
 #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"
@@ -131,14 +130,10 @@ bool FileSystemFileUtilProxy::Copy(
     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);
 }
 
@@ -151,13 +146,10 @@ bool FileSystemFileUtilProxy::Move(
       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);
 }