diff options
| author | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 22:01:51 +0000 |
|---|---|---|
| committer | tbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-24 22:01:51 +0000 |
| commit | 5b7e42e6e9ee09a5fa0b93b6bf3d7339c1db2b0f (patch) | |
| tree | 5a93d1a57760e029fcfc36db69a036421ff04079 /webkit/blob | |
| parent | 33c1c26ae20ac8b60ce78945ad016a277d2b10ec (diff) | |
| download | chromium_src-5b7e42e6e9ee09a5fa0b93b6bf3d7339c1db2b0f.zip chromium_src-5b7e42e6e9ee09a5fa0b93b6bf3d7339c1db2b0f.tar.gz chromium_src-5b7e42e6e9ee09a5fa0b93b6bf3d7339c1db2b0f.tar.bz2 | |
New FileSystemURL cracking
follow up on https://codereview.chromium.org/11648027/
Instead of cracking FileSystemURL in its ctor (somewhat magically, using singleton IsolatedContext and SystemExternalMountPoints), require FileSystemURL to be cracked explicitly.
The FileSystemURL can be cracked using specific MountPoints implementation or using specific FileSystemContext which will select available MountPoints implementation that should be used to crack the url.
(CrackURL/CreateCrackedFileSystemURL methods).
Modify FileSystemURL usages to use new cracking methods.
BUG=158837
TEST=content_unittests: IsolatedContextTest.* ExternalMountPointsTest.* FileSystemContextTest.*
Review URL: https://chromiumcodereview.appspot.com/11787028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob')
| -rw-r--r-- | webkit/blob/blob_url_request_job.cc | 2 | ||||
| -rw-r--r-- | webkit/blob/blob_url_request_job_unittest.cc | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc index 279c1ee..68befac 100644 --- a/webkit/blob/blob_url_request_job.cc +++ b/webkit/blob/blob_url_request_job.cc @@ -562,7 +562,7 @@ void BlobURLRequestJob::CreateFileStreamReader(size_t index, break; case BlobData::Item::TYPE_FILE_FILESYSTEM: reader = file_system_context_->CreateFileStreamReader( - fileapi::FileSystemURL(item.url()), + fileapi::FileSystemURL(file_system_context_->CrackURL(item.url())), item.offset() + additional_offset, item.expected_modification_time()); break; diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc index 54d8f3a..1ed897b 100644 --- a/webkit/blob/blob_url_request_job_unittest.cc +++ b/webkit/blob/blob_url_request_job_unittest.cc @@ -203,9 +203,11 @@ class BlobURLRequestJobTest : public testing::Test { void WriteFileSystemFile(const std::string& filename, const char* buf, int buf_size, base::Time* modification_time) { - fileapi::FileSystemURL url(GURL(kFileSystemURLOrigin), - kFileSystemType, - FilePath().AppendASCII(filename)); + fileapi::FileSystemURL url = + file_system_context_->CreateCrackedFileSystemURL( + GURL(kFileSystemURLOrigin), + kFileSystemType, + FilePath().AppendASCII(filename)); fileapi::FileSystemFileUtil* file_util = file_system_context_->GetFileUtil(kFileSystemType); |