diff options
author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 10:50:50 +0000 |
---|---|---|
committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-06 10:50:50 +0000 |
commit | ccb14ed1454d0c8a891cc980ece99b23a748492b (patch) | |
tree | bec6a3d91102444bc5b3dc1b8b3a09de92a78a6c /webkit/fileapi/file_system_path_manager.cc | |
parent | 563b93997b780ce2ea1683c23acf4c41cebc665e (diff) | |
download | chromium_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_path_manager.cc')
-rw-r--r-- | webkit/fileapi/file_system_path_manager.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/fileapi/file_system_path_manager.cc b/webkit/fileapi/file_system_path_manager.cc index 1013352..2db5045 100644 --- a/webkit/fileapi/file_system_path_manager.cc +++ b/webkit/fileapi/file_system_path_manager.cc @@ -16,7 +16,6 @@ #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h" #include "webkit/fileapi/file_system_util.h" -#include "webkit/fileapi/local_file_system_file_util.h" #include "webkit/fileapi/sandbox_mount_point_provider.h" #include "webkit/glue/webkit_glue.h" @@ -169,7 +168,12 @@ FileSystemFileUtil* FileSystemPathManager::GetFileSystemFileUtil( case kFileSystemTypePersistent: return sandbox_provider_->GetFileSystemFileUtil(); case kFileSystemTypeExternal: - return LocalFileSystemFileUtil::GetInstance(); + if (external_provider_.get()) { + return external_provider_->GetFileSystemFileUtil(); + } else { + NOTREACHED(); + return NULL; + } case kFileSystemTypeUnknown: default: NOTREACHED(); |