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

webkit/fileapi/file_system_file_util_unittest.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 "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/fileapi/cross_file_util_helper.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_test_helper.h"
+#include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/native_file_util.h"
 #include "webkit/fileapi/obfuscated_file_util.h"
 #include "webkit/fileapi/test_file_set.h"
 
 namespace fileapi {
 
 // This is not yet a full unit test for FileSystemFileUtil.  TODO(ericu): Adapt
 // the other subclasses' unit tests, as mentioned in the comments in
 // ObfuscatedFileUtil's unit test.
 // Currently this is just a test of cross-filesystem copy and move, which
@@ skipping 58 matching lines @@
       }
     }
 
     FileSystemPath dest_root = dest_helper.CreatePathFromUTF8("root directory");
 
     // Do the actual copy or move.
     scoped_ptr<FileSystemOperationContext> copy_context(
         src_helper.NewOperationContext());
     copy_context->set_allowed_bytes_growth(1024 * 1024); // OFSFU path quota.
 
-    CrossFileUtilHelper cross_util_helper(
-        copy_context.get(),
-        src_helper.file_util(),
-        dest_helper.file_util(),
-        src_root,
-        dest_root,
-        copy ? CrossFileUtilHelper::OPERATION_COPY
-        : CrossFileUtilHelper::OPERATION_MOVE);
-    ASSERT_EQ(base::PLATFORM_FILE_OK, cross_util_helper.DoWork());
+    if (copy) {
+      ASSERT_EQ(
+          base::PLATFORM_FILE_OK,
+          FileUtilHelper::Copy(
+              copy_context.get(),
+              src_helper.file_util(), dest_helper.file_util(),
+              src_root, dest_root));
+    } else {
+      ASSERT_EQ(
+          base::PLATFORM_FILE_OK,
+          FileUtilHelper::Move(
+              copy_context.get(),
+              src_helper.file_util(), dest_helper.file_util(),
+              src_root, dest_root));
+    }
 
     // Validate that the destination paths are correct.
     for (size_t i = 0; i < test::kRegularTestCaseSize; ++i) {
       const test::TestCaseRecord& test_case = test::kRegularTestCases[i];
       FileSystemPath path = dest_root.Append(test_case.path);
 
       base::PlatformFileInfo dest_file_info;
       FilePath data_path;
       context.reset(NewContext(&dest_helper));
       EXPECT_EQ(base::PLATFORM_FILE_OK,
@@ skipping 60 matching lines @@
 
 TEST_F(FileSystemFileUtilTest, TestCrossFileSystemMoveSameOrigin) {
   GURL origin("http://www.example.com");
   fileapi::FileSystemType src_type = kFileSystemTypePersistent;
   fileapi::FileSystemType dest_type = kFileSystemTypeTemporary;
 
   TestCrossFileSystemCopyMoveHelper(origin, src_type, origin, dest_type, false);
 }
 
 }  // namespace fileapi