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
feiyue1206 · Jul 4, 2013 · 73f73a0 · 73f73a0
1 parent 2a1c343
commit 73f73a0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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());

diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
@@ -244,7 +244,7 @@
     "extension_types": ["extension"],
     "whitelist": [ "2FC374607C2DF285634B67C64A2E356C607091C3" ]
   }],
-  "fileSystem.retainFiles": [{
+  "fileSystem.retainEntries": [{
     "channel": "dev",
     "extension_types": ["platform_app"]
   }],

diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h
@@ -76,7 +76,7 @@ class APIPermission {
     kFileBrowserHandlerInternal,
     kFileBrowserPrivate,
     kFileSystem,
-    kFileSystemRetainFiles,
+    kFileSystemRetainEntries,
     kFileSystemWrite,
     kFontSettings,
     kFullscreen,

diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -252,7 +252,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
     // a file chooser dialog and selected a file. Selecting the file is
     // considered consent to read it.
     { APIPermission::kFileSystem, "fileSystem" },
-    { APIPermission::kFileSystemRetainFiles, "fileSystem.retainFiles" },
+    { APIPermission::kFileSystemRetainEntries, "fileSystem.retainEntries" },
     { APIPermission::kFileSystemWrite, "fileSystem.write",
       APIPermissionInfo::kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_WRITE,

diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -720,7 +720,7 @@ TEST(PermissionsTest, PermissionMessages) {
   // Platform apps.
   skip.insert(APIPermission::kBluetooth);
   skip.insert(APIPermission::kFileSystem);
-  skip.insert(APIPermission::kFileSystemRetainFiles);
+  skip.insert(APIPermission::kFileSystemRetainEntries);
   skip.insert(APIPermission::kSocket);
   skip.insert(APIPermission::kUsbDevice);