diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 04:56:21 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-08 04:56:21 +0000 |
| commit | c3d5d25e9f3128c693debcfc457e71d2d6b880d5 (patch) | |
| tree | 49cf3150ea64fcbccc826bb359ec555d680a88c5 /webkit/fileapi/file_system_file_util_unittest.cc | |
| parent | 1bc85b268333b7c8eec62d4d5324067978fafc98 (diff) | |
| download | chromium_src-c3d5d25e9f3128c693debcfc457e71d2d6b880d5.zip chromium_src-c3d5d25e9f3128c693debcfc457e71d2d6b880d5.tar.gz chromium_src-c3d5d25e9f3128c693debcfc457e71d2d6b880d5.tar.bz2 | |
Merge CrossFileUtilHelper to FileUtilHelper as Copy() and Move().
BUG=114732
TEST="existing tests"
Review URL: http://codereview.chromium.org/9616033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_file_util_unittest.cc')
| -rw-r--r-- | webkit/fileapi/file_system_file_util_unittest.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc index 40cd803..707ea71 100644 --- a/webkit/fileapi/file_system_file_util_unittest.cc +++ b/webkit/fileapi/file_system_file_util_unittest.cc @@ -8,10 +8,10 @@ #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" @@ -90,15 +90,21 @@ class FileSystemFileUtilTest : public testing::Test { 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) { |