Remove APIPermission::kFileSystemWriteDirectory

In the new permission system, the corresponding message can be represented by kFileSystemWrite + kFileSystemDirectory, we don't need a special fake ID anymore.

Skipping presubmit because of renamed histogram entry.
NOPRESUBMIT=true

BUG=284849

Review URL: https://codereview.chromium.org/1217773006

Cr-Commit-Position: refs/heads/master@{#345897}

3 files changed, 1 insertions, 14 deletions

diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index b2c6d46..e49a153 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -118,7 +118,7 @@ class APIPermission {
     kFileSystemRequestFileSystem,
     kFileSystemRetainEntries,
     kFileSystemWrite,
-    kFileSystemWriteDirectory,
+    kDeleted_FileSystemWriteDirectory,
     kFirstRunPrivate,
     kFontSettings,
     kFullscreen,
diff --git a/extensions/common/permissions/api_permission_set.cc b/extensions/common/permissions/api_permission_set.cc
index 74a3e66..9f6df2f 100644
--- a/extensions/common/permissions/api_permission_set.cc
+++ b/extensions/common/permissions/api_permission_set.cc
@@ -182,17 +182,6 @@ bool APIPermissionSet::ParseFromJSON(
   return true;
 }
 
-void APIPermissionSet::AddImpliedPermissions() {
-  // The fileSystem.write and fileSystem.directory permissions imply
-  // fileSystem.writeDirectory.
-  // Has a corresponding rule in ChromePermissionMessageProvider.
-  // TODO(sammc): Remove this. See http://crbug.com/284849.
-  if (ContainsKey(map(), APIPermission::kFileSystemWrite) &&
-      ContainsKey(map(), APIPermission::kFileSystemDirectory)) {
-    insert(APIPermission::kFileSystemWriteDirectory);
-  }
-}
-
 PermissionID::PermissionID(APIPermission::ID id)
     : std::pair<APIPermission::ID, base::string16>(id, base::string16()) {
 }
diff --git a/extensions/common/permissions/api_permission_set.h b/extensions/common/permissions/api_permission_set.h
index 43b97ec..a596a0e 100644
--- a/extensions/common/permissions/api_permission_set.h
+++ b/extensions/common/permissions/api_permission_set.h
@@ -60,8 +60,6 @@ class APIPermissionSet : public BaseSetOperators<APIPermissionSet> {
       APIPermissionSet* api_permissions,
       base::string16* error,
       std::vector<std::string>* unhandled_permissions);
-
-  void AddImpliedPermissions();
 };
 
 // An ID representing a single permission that belongs to an app or extension.