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

webkit/fileapi/file_system_test_helper.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_test_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
 
 FileSystemTestOriginHelper::FileSystemTestOriginHelper(
     const GURL& origin, FileSystemType type)
     : origin_(origin), type_(type), file_util_(NULL) {
 }
@@ skipping 101 matching lines @@
 
 FileSystemPath FileSystemTestOriginHelper::CreatePath(
     const FilePath& path) const {
   return FileSystemPath(origin_, type_, path);
 }
 
 base::PlatformFileError FileSystemTestOriginHelper::SameFileUtilCopy(
     FileSystemOperationContext* context,
     const FileSystemPath& src,
     const FileSystemPath& dest) const {
-  CrossFileUtilHelper cross_util_helper(
-      context,
-      file_util(), file_util(),
-      src, dest,
-      CrossFileUtilHelper::OPERATION_COPY);
-  return cross_util_helper.DoWork();
+  return FileUtilHelper::Copy(context, file_util(), file_util(), src, dest);
 }
 
 base::PlatformFileError FileSystemTestOriginHelper::SameFileUtilMove(
     FileSystemOperationContext* context,
     const FileSystemPath& src,
     const FileSystemPath& dest) const {
-  CrossFileUtilHelper cross_util_helper(
-      context,
-      file_util(), file_util(),
-      src, dest,
-      CrossFileUtilHelper::OPERATION_MOVE);
-  return cross_util_helper.DoWork();
+  return FileUtilHelper::Move(context, file_util(), file_util(), src, dest);
 }
 
 int64 FileSystemTestOriginHelper::GetCachedOriginUsage() const {
   return FileSystemUsageCache::GetUsage(GetUsageCachePath());
 }
 
 bool FileSystemTestOriginHelper::RevokeUsageCache() const {
   return file_util::Delete(GetUsageCachePath(), false);
 }
 
@@ skipping 15 matching lines @@
 }
 
 FileSystemOperationContext* FileSystemTestOriginHelper::NewOperationContext() {
   DCHECK(file_system_context_.get());
   FileSystemOperationContext* context =
     new FileSystemOperationContext(file_system_context_.get());
   return context;
 }
 
 }  // namespace fileapi