Extensions: Remove PermissionMessage (permission_message.h/cc)

extensions/common/permissions/media_galleries_permission.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/permissions/media_galleries_permission.h"
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 20 matching lines @@
   if (has_delete) {
     if (has_read)
       return true;
     if (error)
       *error = "delete permission requires read permission";
     return false;
   }
   return true;
 }
 
-// Adds the permissions from the |data_set| to the permission lists that are
-// not NULL. If NULL, that list is ignored.
+// Adds the permissions from the |data_set| to |ids|.
 void AddPermissionsToLists(
     const std::set<MediaGalleriesPermissionData>& data_set,
-    PermissionIDSet* ids,
-    PermissionMessages* messages) {
+    PermissionIDSet* ids) {
   // TODO(sashab): Once GetMessages() is deprecated, move this logic back into
   // GetPermissions().
   bool has_all_auto_detected = false;
   bool has_read = false;
   bool has_copy_to = false;
   bool has_delete = false;
 
   for (std::set<MediaGalleriesPermissionData>::const_iterator it =
            data_set.begin();
        it != data_set.end(); ++it) {
@@ skipping 16 matching lines @@
   // If |has_all_auto_detected| is false, then Chrome will prompt the user at
   // runtime when the extension call the getMediaGalleries API.
   if (!has_all_auto_detected)
     return;
   // No access permission case.
   if (!has_read)
     return;
 
   // Separate PermissionMessage IDs for read, copyTo, and delete. Otherwise an
   // extension can silently gain new access capabilities.
-  if (messages) {
-    messages->push_back(PermissionMessage(
-        PermissionMessage::kMediaGalleriesAllGalleriesRead,
-        l10n_util::GetStringUTF16(
-            IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ)));
-  }
-  if (ids)
-    ids->insert(APIPermission::kMediaGalleriesAllGalleriesRead);
+  ids->insert(APIPermission::kMediaGalleriesAllGalleriesRead);
 
   // For copyTo and delete, the proper combined permission message will be
   // derived in ChromePermissionMessageProvider::GetWarningMessages(), such
   // that the user get 1 entry for all media galleries access permissions,
   // rather than several separate entries.
-  if (has_copy_to) {
-    if (messages) {
-      messages->push_back(PermissionMessage(
-          PermissionMessage::kMediaGalleriesAllGalleriesCopyTo,
-          base::string16()));
-    }
-    if (ids)
-      ids->insert(APIPermission::kMediaGalleriesAllGalleriesCopyTo);
-  }
-  if (has_delete) {
-    if (messages) {
-      messages->push_back(PermissionMessage(
-          PermissionMessage::kMediaGalleriesAllGalleriesDelete,
-          base::string16()));
-    }
-    if (ids)
-      ids->insert(APIPermission::kMediaGalleriesAllGalleriesDelete);
-  }
-  return;
+  if (has_copy_to)
+    ids->insert(APIPermission::kMediaGalleriesAllGalleriesCopyTo);
+  if (has_delete)
+    ids->insert(APIPermission::kMediaGalleriesAllGalleriesDelete);
 }
 
 }  // namespace
 
 const char MediaGalleriesPermission::kAllAutoDetectedPermission[] =
     "allAutoDetected";
 const char MediaGalleriesPermission::kScanPermission[] = "scan";
 const char MediaGalleriesPermission::kReadPermission[] = "read";
 const char MediaGalleriesPermission::kCopyToPermission[] = "copyTo";
 const char MediaGalleriesPermission::kDeletePermission[] = "delete";
@@ skipping 56 matching lines @@
     // Fail so developers notice this.
     NOTREACHED();
     return false;
   }
 
   return IsValidPermissionSet(has_read, has_copy_to, has_delete, error);
 }
 
 PermissionIDSet MediaGalleriesPermission::GetPermissions() const {
   PermissionIDSet result;
-  AddPermissionsToLists(data_set_, &result, NULL);
+  AddPermissionsToLists(data_set_, &result);
   return result;
 }
 
 }  // namespace extensions