Extensions: Switch to new permission message system, part I

chrome/common/extensions/permissions/chrome_permission_message_rules.cc

Index: chrome/common/extensions/permissions/chrome_permission_message_rules.cc
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
index 0c61bce993e37f0aaca129bf64ac7d6f45130267..cab50dcedd2eef73bb1f7736a93b9679c31cc708 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+++ b/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
@@ -265,15 +265,15 @@ ChromePermissionMessageRule::GetAllRules() {
       // Parameterized permission messages:
       // Messages generated by the sockets permission.
       {new SpaceSeparatedListFormatter(
-           IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST,
-           IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS),
-       {APIPermission::kSocketSpecificHosts},
-       {}},
-      {new SpaceSeparatedListFormatter(
            IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN,
            IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS),
        {APIPermission::kSocketDomainHosts},
        {}},
+      {new SpaceSeparatedListFormatter(
+           IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST,
+           IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS),
+       {APIPermission::kSocketSpecificHosts},
+       {}},
 
       // Messages generated by host permissions.
       {new CommaSeparatedListFormatter(
@@ -347,10 +347,15 @@ ChromePermissionMessageRule::GetAllRules() {
        {APIPermission::kSessions, APIPermission::kHistory},
        {APIPermission::kTab,
         APIPermission::kFavicon,
-        APIPermission::kTopSites}},
+        APIPermission::kProcesses,
+        APIPermission::kTopSites,
+        APIPermission::kWebNavigation}},
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS,
        {APIPermission::kSessions, APIPermission::kTab},
-       {APIPermission::kFavicon, APIPermission::kTopSites}},
+       {APIPermission::kFavicon,
+        APIPermission::kProcesses,
+        APIPermission::kTopSites,
+        APIPermission::kWebNavigation}},
 
       // Suppression list taken from
       // ChromePermissionMessageProvider::GetPermissionMessages():
@@ -368,7 +373,6 @@ ChromePermissionMessageRule::GetAllRules() {
        {APIPermission::kHistory},
        {APIPermission::kFavicon,
         APIPermission::kTab,
-        APIPermission::kFavicon,
         APIPermission::kTopSites}},
       // A special hack: If kFileSystemWriteDirectory would be displayed, hide
       // kFileSystemDirectory as the write directory message implies it.