diff options
| author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 12:47:47 +0000 |
|---|---|---|
| committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 12:47:47 +0000 |
| commit | b4449206da3e3272bb7d91b16c484fc4c2f2a7d3 (patch) | |
| tree | 3cc527b910e09ab8debc6154dfaa73124194aebf /webkit/fileapi | |
| parent | fc0de26745758c5d90b6f386567fa6b761026421 (diff) | |
| download | chromium_src-b4449206da3e3272bb7d91b16c484fc4c2f2a7d3.zip chromium_src-b4449206da3e3272bb7d91b16c484fc4c2f2a7d3.tar.gz chromium_src-b4449206da3e3272bb7d91b16c484fc4c2f2a7d3.tar.bz2 | |
Add browser_tests for FileAPI with Quota, and remove unlimited access for file:/// when allow_file_access_from_files.
BUG=95120
TEST=browser_tests:FileSystemBrowserTest*
Review URL: http://codereview.chromium.org/7715024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_context.cc | 1 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_context_unittest.cc | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc index d4dffc2..82da15e 100644 --- a/webkit/fileapi/file_system_context.cc +++ b/webkit/fileapi/file_system_context.cc @@ -62,7 +62,6 @@ bool FileSystemContext::IsStorageUnlimited(const GURL& origin) { // is file, or if unlimited quota for this process was explicitly requested, // return true. return unlimited_quota_ || - (allow_file_access_from_files_ && origin.SchemeIsFile()) || (special_storage_policy_.get() && special_storage_policy_->IsStorageUnlimited(origin)); } diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc index 19da157..f5d6983e 100644 --- a/webkit/fileapi/file_system_context_unittest.cc +++ b/webkit/fileapi/file_system_context_unittest.cc @@ -49,15 +49,6 @@ TEST(FileSystemContextTest, IsStorageUnlimited) { EXPECT_FALSE(context->IsStorageUnlimited(GURL(kTestOrigins[i]))); } - // With allow_file_access=true cases. - context = NewFileSystemContext(true, false, NULL); - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestOrigins); ++i) { - SCOPED_TRACE(testing::Message() << "IsStorageUnlimited /w " - "allow_file_access=true #" << i << " " << kTestOrigins[i]); - GURL origin(kTestOrigins[i]); - EXPECT_EQ(origin.SchemeIsFile(), context->IsStorageUnlimited(origin)); - } - // With unlimited_quota=true cases. context = NewFileSystemContext(false, true, NULL); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestOrigins); ++i) { |