diff options
| author | sammc@chromium.org <sammc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 02:15:12 +0000 |
|---|---|---|
| committer | sammc@chromium.org <sammc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-04 02:15:12 +0000 |
| commit | 73f73a0d19ae116f298f037cb5202c45f1d1dce0 (patch) | |
| tree | 6a8f934112e84b7320ccbfc0d118cc59475f906c /apps | |
| parent | 2a1c343479ee8dc7eec5cedcd25bef7122ad74a3 (diff) | |
| download | chromium_src-73f73a0d19ae116f298f037cb5202c45f1d1dce0.zip chromium_src-73f73a0d19ae116f298f037cb5202c45f1d1dce0.tar.gz chromium_src-73f73a0d19ae116f298f037cb5202c45f1d1dce0.tar.bz2 | |
Rename fileSystem.retainFiles to fileSystem.retainEntries.
BUG=224684
Review URL: https://chromiumcodereview.appspot.com/18615002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/saved_files_service.cc | 2 | ||||
| -rw-r--r-- | apps/saved_files_service.h | 2 | ||||
| -rw-r--r-- | apps/saved_files_service_unittest.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index 2ed3919..c0d5846 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -262,7 +262,7 @@ const SavedFileEntry* SavedFilesService::GetFileEntry( void SavedFilesService::ClearQueueIfNoRetainPermission( const Extension* extension) { if (!extension->GetActivePermissions()->HasAPIPermission( - APIPermission::kFileSystemRetainFiles)) { + APIPermission::kFileSystemRetainEntries)) { ClearQueue(extension); } } diff --git a/apps/saved_files_service.h b/apps/saved_files_service.h index dfaae24..48a9a42 100644 --- a/apps/saved_files_service.h +++ b/apps/saved_files_service.h @@ -92,7 +92,7 @@ class SavedFilesService : public BrowserContextKeyedService, const std::string& extension_id); // Clears all retained files if the app does not have the - // fileSystem.retainFiles permission. + // fileSystem.retainEntries permission. void ClearQueueIfNoRetainPermission(const extensions::Extension* extension); // Clears all retained files. diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc index 01fc1dd..cc66c35 100644 --- a/apps/saved_files_service_unittest.cc +++ b/apps/saved_files_service_unittest.cc @@ -48,7 +48,7 @@ class SavedFilesServiceUnitTest : public testing::Test { " }" " }," " \"permissions\": [" - " {\"fileSystem\": [\"retainFiles\"]}" + " {\"fileSystem\": [\"retainEntries\"]}" " ]" "}")); service_ = SavedFilesService::Get(env_.profile()); @@ -133,7 +133,7 @@ TEST_F(SavedFilesServiceUnitTest, RetainTwoFilesTest) { EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); // ClearQueueIfNoRetainPermission should be a no-op because the app has the - // fileSystem.retainFiles permission. + // fileSystem.retainEntries permission. service_->ClearQueueIfNoRetainPermission(extension_); TRACE_CALL(CheckEntrySequenceNumber(1, 3)); TRACE_CALL(CheckEntrySequenceNumber(2, 2)); @@ -148,7 +148,7 @@ TEST_F(SavedFilesServiceUnitTest, RetainTwoFilesTest) { EXPECT_FALSE(service_->IsRegistered(extension_->id(), GenerateId(3))); } -TEST_F(SavedFilesServiceUnitTest, NoRetainFilesPermissionTest) { +TEST_F(SavedFilesServiceUnitTest, NoRetainEntriesPermissionTest) { extension_ = env_.MakeExtension(*base::test::ParseJson( "{\"app\": {\"background\": {\"scripts\": [\"background.js\"]}}," "\"permissions\": [\"fileSystem\"]}")); @@ -161,7 +161,7 @@ TEST_F(SavedFilesServiceUnitTest, NoRetainFilesPermissionTest) { EXPECT_FALSE(service_->GetFileEntry(extension_->id(), "another id")); // ClearQueueIfNoRetainPermission should clear the queue, since the app does - // not have the "retainFiles" permission. + // not have the "retainEntries" permission. service_->ClearQueueIfNoRetainPermission(extension_); std::vector<SavedFileEntry> entries = service_->GetAllFileEntries(extension_->id()); |