Extensions: Switch to new permission message system, part I

extensions/common/permissions/permissions_data.h

Index: extensions/common/permissions/permissions_data.h
diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h
index ab7ea526c499e11f7a49de77b544de852583a35c..3fee044642ea6a1ed7b1ba158bd57694cd4a8a44 100644
--- a/extensions/common/permissions/permissions_data.h
+++ b/extensions/common/permissions/permissions_data.h
@@ -16,6 +16,7 @@
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/coalesced_permission_message.h"
 #include "extensions/common/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
 
 class GURL;
@@ -71,7 +72,7 @@ class PermissionsData {
       const Extension* extension,
       const PermissionSet* permissions);
 
-  // Returns true if we should skip the permisisons warning for the extension
+  // Returns true if we should skip the permissions warning for the extension
   // with the given |extension_id|.
   static bool ShouldSkipPermissionWarnings(const std::string& extension_id);
 
@@ -138,13 +139,17 @@ class PermissionsData {
 
   // Returns the full list of permission messages that should display at install
   // time as strings.
-  // TODO(sashab): Deprecate this in favor of GetCoalescedPermissionMessages().
-  std::vector<base::string16> GetPermissionMessageStrings() const;
+  PermissionMessageStrings GetPermissionMessageStrings() const;
+
+  // Returns the full list of permission messages that should display at install
+  // time as strings.
+  // TODO(sashab): Deprecate this in favor of GetPermissionMessageStrings.
+  std::vector<base::string16> GetLegacyPermissionMessageStrings() const;
 
   // Returns the full list of permission details for messages that should
   // display at install time as strings.
-  // TODO(sashab): Deprecate this in favor of GetCoalescedPermissionMessages().
-  std::vector<base::string16> GetPermissionMessageDetailsStrings() const;
+  // TODO(sashab): Deprecate this in favor of GetPermissionMessageStrings.
+  std::vector<base::string16> GetLegacyPermissionMessageDetailsStrings() const;
 
   // Returns the full list of permission details for messages that should
   // display at install time, in a nested format ready for display.