diff options
| author | dmikurube@google.com <dmikurube@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 11:41:49 +0000 |
|---|---|---|
| committer | dmikurube@google.com <dmikurube@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 11:41:49 +0000 |
| commit | 7878ecec2dc521aeb4d46071663dbf00897a2b77 (patch) | |
| tree | 20ebcf685c504be36d13d9f8d78cace7bbe6b4d9 /webkit/fileapi/file_system_file_util_unittest.cc | |
| parent | 3beeb9a66dac138493948f328107686688a76ff9 (diff) | |
| download | chromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.zip chromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.tar.gz chromium_src-7878ecec2dc521aeb4d46071663dbf00897a2b77.tar.bz2 | |
[Refactor] to rename and re-layer the file_util stack layers.
Splits FileSystemFileUtil into two classes.
1. FileSystemFileUtil (pure virtual and non-virtual functions + functions to forward to an underlying file_util.)
2. NativeFileUtil (FileUtil for OS-native operations)
Renames *FileSystemFileUtil into *FileUtil except for FileSystemFileUtil.
Renames *_file_system_file_util.{cc,h} into *_file_util.{cc,h}.
Renames variable *_file_system_file_util into *_file_util.
BUG=none
TEST=All FileAPI-related tests
Review URL: http://codereview.chromium.org/7470037
Patch from Dai Mikurube <dmikurube@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99641 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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc index 459a19c..8837cfa 100644 --- a/webkit/fileapi/file_system_file_util_unittest.cc +++ b/webkit/fileapi/file_system_file_util_unittest.cc @@ -11,7 +11,8 @@ #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/obfuscated_file_system_file_util.h" +#include "webkit/fileapi/native_file_util.h" +#include "webkit/fileapi/obfuscated_file_util.h" using namespace fileapi; @@ -48,7 +49,7 @@ const CopyMoveTestCaseRecord kCopyMoveTestCases[] = { // This is not yet a full unit test for FileSystemFileUtil. TODO(ericu): Adapt // the other subclasses' unit tests, as mentioned in the comments in -// ObfuscatedFileSystemFileUtil's unit test. +// ObfuscatedFileUtil's unit test. // Currently this is just a test of cross-filesystem copy and move, which // actually exercises subclasses of FileSystemFileUtil as well as the class // itself. We currently only test copies between obfuscated filesystems. @@ -77,9 +78,8 @@ class FileSystemFileUtilTest : public testing::Test { bool copy) { ScopedTempDir base_dir; ASSERT_TRUE(base_dir.CreateUniqueTempDir()); - scoped_refptr<ObfuscatedFileSystemFileUtil> file_util( - new ObfuscatedFileSystemFileUtil(base_dir.path(), - new FileSystemFileUtil())); + scoped_refptr<ObfuscatedFileUtil> file_util( + new ObfuscatedFileUtil(base_dir.path(), new NativeFileUtil())); FileSystemTestOriginHelper src_helper(src_origin, src_type); src_helper.SetUp(base_dir.path(), false, // incognito @@ -115,8 +115,8 @@ class FileSystemFileUtilTest : public testing::Test { FileSystemContext* file_system_context = dest_helper.file_system_context(); scoped_ptr<FileSystemOperationContext> copy_context( new FileSystemOperationContext(file_system_context, NULL)); - copy_context->set_src_file_system_file_util(file_util); - copy_context->set_dest_file_system_file_util(file_util); + copy_context->set_src_file_util(file_util); + copy_context->set_dest_file_util(file_util); copy_context->set_src_origin_url(src_helper.origin()); copy_context->set_dest_origin_url(dest_helper.origin()); copy_context->set_src_type(src_helper.type()); |