Extensions: Switch to new permission message system, part I

chrome/common/extensions/permissions/chrome_permission_message_rules.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 "chrome/common/extensions/permissions/chrome_permission_message_rules.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/permissions/api_permission_set.h"
@@ skipping 247 matching lines @@
        {APIPermission::kFullAccess},
        {APIPermission::kHostsAll,
         APIPermission::kHostsAllReadOnly,
         APIPermission::kDeclarativeWebRequest,
         APIPermission::kTopSites,
         APIPermission::kTab}},
 
       // Parameterized permission messages:
       // Messages generated by the sockets permission.
       {new SpaceSeparatedListFormatter(
+           IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN,

[Marc Treib, 2015/03/09 14:08:02]

Changed the order here because some tests in permission_set_unittest check that
domain warnings come before host warnings.

+           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},
        {}},
-      {new SpaceSeparatedListFormatter(
-           IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN,
-           IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS),
-       {APIPermission::kSocketDomainHosts},
-       {}},
 
       // Messages generated by host permissions.
       {new CommaSeparatedListFormatter(
            IDS_EXTENSION_PROMPT_WARNING_1_HOST_READ_ONLY,
            IDS_EXTENSION_PROMPT_WARNING_2_HOSTS_READ_ONLY,
            IDS_EXTENSION_PROMPT_WARNING_3_HOSTS_READ_ONLY,
            IDS_EXTENSION_PROMPT_WARNING_HOSTS_LIST_READ_ONLY),
        {APIPermission::kHostReadOnly},
        {}},
       {new CommaSeparatedListFormatter(IDS_EXTENSION_PROMPT_WARNING_1_HOST,
@@ skipping 366 matching lines @@
   insert(permission_four);
   insert(permission_five);
   insert(permission_six);
 }
 
 ChromePermissionMessageRule::PermissionIDSetInitializer::
     ~PermissionIDSetInitializer() {
 }
 
 }  // namespace extensions