Added GetCoalescedPermissionMessages to PermissionMessageProvider

Added a GetCoalescedPermissionMessages() method to
PermissionMessageProvider and all its subclasses, including
ChromePermissionMessageProvider. Also implemented the first set of rules
to achieve parity with the existing apps/extensions permission messages
system.

Also updated PermissionsData to have a GetCoalescedPermissionMessages()
function which returns the coalesced permission messages for an app
or extension, and updated the unit tests to check the test output for
both the legacy and new systems.

No callsites that display permission messages have been updated to use
the new system.

BUG=398257

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

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

2 files changed, 17 insertions, 0 deletions

diff --git a/extensions/test/test_permission_message_provider.cc b/extensions/test/test_permission_message_provider.cc
index 288b622..d13c297 100644
--- a/extensions/test/test_permission_message_provider.cc
+++ b/extensions/test/test_permission_message_provider.cc
@@ -18,6 +18,12 @@ PermissionMessages TestPermissionMessageProvider::GetPermissionMessages(
   return PermissionMessages();
 }
 
+CoalescedPermissionMessages
+TestPermissionMessageProvider::GetCoalescedPermissionMessages(
+    const PermissionIDSet& permissions) const {
+  return CoalescedPermissionMessages();
+}
+
 std::vector<base::string16> TestPermissionMessageProvider::GetWarningMessages(
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
@@ -38,4 +44,10 @@ bool TestPermissionMessageProvider::IsPrivilegeIncrease(
   return false;
 }
 
+PermissionIDSet TestPermissionMessageProvider::GetAllPermissionIDs(
+    const PermissionSet* permissions,
+    Manifest::Type extension_type) const {
+  return PermissionIDSet();
+}
+
 }  // namespace extensions
diff --git a/extensions/test/test_permission_message_provider.h b/extensions/test/test_permission_message_provider.h
index 9e91293..af1fa5e 100644
--- a/extensions/test/test_permission_message_provider.h
+++ b/extensions/test/test_permission_message_provider.h
@@ -19,6 +19,8 @@ class TestPermissionMessageProvider : public PermissionMessageProvider {
   PermissionMessages GetPermissionMessages(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
+  CoalescedPermissionMessages GetCoalescedPermissionMessages(
+      const PermissionIDSet& permissions) const override;
   std::vector<base::string16> GetWarningMessages(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
@@ -28,6 +30,9 @@ class TestPermissionMessageProvider : public PermissionMessageProvider {
   bool IsPrivilegeIncrease(const PermissionSet* old_permissions,
                            const PermissionSet* new_permissions,
                            Manifest::Type extension_type) const override;
+  PermissionIDSet GetAllPermissionIDs(
+      const PermissionSet* permissions,
+      Manifest::Type extension_type) const override;
 
   DISALLOW_COPY_AND_ASSIGN(TestPermissionMessageProvider);
 };