Added PermissionIDSet to APIPermissions

extensions/common/api/sockets/sockets_manifest_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/api/sockets/sockets_manifest_permission.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 300 matching lines @@
                  ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN
                  : IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS;
     messages.push_back(PermissionMessage(
         PermissionMessage::kSocketDomainHosts,
         l10n_util::GetStringFUTF16(
             id,
             JoinString(
                 std::vector<base::string16>(domains.begin(), domains.end()),
                 ' '))));
     // TODO(sashab): Add rules to ChromePermissionMessageProvider:
-    // kSocketDomainHostsSingular ->
-    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN
-    // kSocketDomainHostsPlural ->
-    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS
-    APIPermission::ID pid = (domains.size() == 1)
-                                ? APIPermission::kSocketDomainHostsSingular
-                                : APIPermission::kSocketDomainHostsPlural;
+    // kSocketDomainHosts ->
+    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN if 1
+    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS if many
     for (const auto& domain : domains)
-      ids.insert(pid, domain);
+      ids.insert(APIPermission::kSocketDomainHosts, domain);
   }
 }
 
 void SocketsManifestPermission::AddSpecificHostMessage(
     PermissionMessages& messages,
     PermissionIDSet& ids) const {
   std::set<base::string16> hostnames;
   for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();
        it != permissions_.end();
        ++it) {
     if (it->GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)
       hostnames.insert(base::UTF8ToUTF16(it->pattern().host));
   }
   if (!hostnames.empty()) {
     // TODO(sashab): This is not correct for all languages - add proper
     // internationalization of this string for all plural states.
     int id = (hostnames.size() == 1)
                  ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST
                  : IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS;
     messages.push_back(PermissionMessage(
         PermissionMessage::kSocketSpecificHosts,
         l10n_util::GetStringFUTF16(
             id,
             JoinString(
                 std::vector<base::string16>(hostnames.begin(), hostnames.end()),
                 ' '))));
     // TODO(sashab): Add rules to ChromePermissionMessageProvider:
-    // kSocketSpecificHostsSingular ->
-    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST
-    // kSocketSpecificHostsPlural ->
-    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS
-    APIPermission::ID pid = (hostnames.size() == 1)
-                                ? APIPermission::kSocketSpecificHostsSingular
-                                : APIPermission::kSocketSpecificHostsPlural;
+    // kSocketSpecificHosts ->
+    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST if 1
+    //         IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS if many
     for (const auto& hostname : hostnames)
-      ids.insert(pid, hostname);
+      ids.insert(APIPermission::kSocketSpecificHosts, hostname);
   }
 }
 
 void SocketsManifestPermission::AddNetworkListMessage(
     PermissionMessages& messages,
     PermissionIDSet& ids) const {
   for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();
        it != permissions_.end();
        ++it) {
     if (it->pattern().type == SocketPermissionRequest::NETWORK_STATE) {
       // TODO(sashab): Add a rule to ChromePermissionMessageProvider:
       // kNetworkState -> IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE
       ids.insert(APIPermission::kNetworkState);
       messages.push_back(
           PermissionMessage(PermissionMessage::kNetworkState,
                             l10n_util::GetStringUTF16(
                                 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE)));
     }
   }
 }
 
 }  // namespace extensions