summaryrefslogtreecommitdiffstats
path: root/webkit/fileapi/file_system_operation_unittest.cc
diff options
context:
space:
mode:
authordmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-06 10:50:50 +0000
committerdmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-06 10:50:50 +0000
commitccb14ed1454d0c8a891cc980ece99b23a748492b (patch)
treebec6a3d91102444bc5b3dc1b8b3a09de92a78a6c /webkit/fileapi/file_system_operation_unittest.cc
parent563b93997b780ce2ea1683c23acf4c41cebc665e (diff)
downloadchromium_src-ccb14ed1454d0c8a891cc980ece99b23a748492b.zip
chromium_src-ccb14ed1454d0c8a891cc980ece99b23a748492b.tar.gz
chromium_src-ccb14ed1454d0c8a891cc980ece99b23a748492b.tar.bz2
Change {Obfuscated|Local}FileSystemFileUtil non-Singleton to take an underlying *FileUtil.
This change : * reduces dependency between FileUtils, and * enables more flexible stacking of FileSystemFileUtil, such as {Obfuscated|Local}FSFU without any quota operation. BUG=none TEST=*FileUtilTest.*,FileSystemPathManagerTest.*,SandboxMountPointProvider.*,FileSystem*OperationTest.*,FileWriterDelegateTest.*,FileSystemQuotaTest.* Review URL: http://codereview.chromium.org/7174002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_operation_unittest.cc')
-rw-r--r--webkit/fileapi/file_system_operation_unittest.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index 9cd6103..e1ece0ec 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -154,7 +154,9 @@ FilePath ASCIIToFilePath(const std::string& str) {
class FileSystemOperationTest : public testing::Test {
public:
FileSystemOperationTest()
- : status_(kFileOperationStatusNotSet) {
+ : status_(kFileOperationStatusNotSet),
+ local_file_util_(
+ new LocalFileSystemFileUtil(QuotaFileUtil::GetInstance())) {
EXPECT_TRUE(base_.CreateUniqueTempDir());
}
@@ -248,6 +250,7 @@ class FileSystemOperationTest : public testing::Test {
std::vector<base::FileUtilProxy::Entry> entries_;
private:
+ scoped_ptr<LocalFileSystemFileUtil> local_file_util_;
scoped_refptr<QuotaManager> quota_manager_;
scoped_refptr<QuotaManagerProxy> quota_manager_proxy_;
DISALLOW_COPY_AND_ASSIGN(FileSystemOperationTest);
@@ -304,7 +307,7 @@ void FileSystemOperationTest::SetUp() {
false /* incognito */,
false /* unlimited quota */,
quota_manager_proxy_.get(),
- LocalFileSystemFileUtil::GetInstance());
+ local_file_util_.get());
}
void FileSystemOperationTest::TearDown() {