diff options
| author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 22:19:17 +0000 |
|---|---|---|
| committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-20 22:19:17 +0000 |
| commit | eeed85c4662942e0c9e557d36fa0d26a938058e5 (patch) | |
| tree | 3e6e267779cd0de15b1dfb8543e399023a4b1342 /webkit/fileapi/file_system_context.cc | |
| parent | fe2534f1d0294dadd3bc915982ef378906a2be57 (diff) | |
| download | chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.zip chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.gz chromium_src-eeed85c4662942e0c9e557d36fa0d26a938058e5.tar.bz2 | |
Merge 82266 - Fixed file/directory url resolution for external mount point provider.Per Eric's request, refactored FileSystemDirURLRequestJob and FileSystemURLRequestJob classes to resolve local file system through a new operation.BUG=chromium-os:14225TEST=added new test cases to FileSystemPathManagerTest.*, added FileSystemOperationTest.TestGetLocalFilePathSuccessReview URL: http://codereview.chromium.org/6864040
TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/6882102
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@82372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_context.cc')
| -rw-r--r-- | webkit/fileapi/file_system_context.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc index 205963a..7e0d62e 100644 --- a/webkit/fileapi/file_system_context.cc +++ b/webkit/fileapi/file_system_context.cc @@ -20,17 +20,21 @@ FileSystemContext::FileSystemContext( const FilePath& profile_path, bool is_incognito, bool allow_file_access, - bool unlimited_quota) + bool unlimited_quota, + FileSystemPathManager* path_manager) : file_message_loop_(file_message_loop), io_message_loop_(io_message_loop), special_storage_policy_(special_storage_policy), allow_file_access_from_files_(allow_file_access), unlimited_quota_(unlimited_quota), - path_manager_(new FileSystemPathManager( - file_message_loop, profile_path, special_storage_policy, is_incognito, - allow_file_access)), + path_manager_(path_manager), usage_tracker_(new FileSystemUsageTracker( file_message_loop, profile_path, is_incognito)) { + if (!path_manager) { + path_manager_.reset(new FileSystemPathManager( + file_message_loop, profile_path, special_storage_policy, + is_incognito, allow_file_access)); + } } FileSystemContext::~FileSystemContext() { |