Removed duplicate code from Socket permission messages

extensions/common/api/sockets/sockets_manifest_permission.h

Index: extensions/common/api/sockets/sockets_manifest_permission.h
diff --git a/extensions/common/api/sockets/sockets_manifest_permission.h b/extensions/common/api/sockets/sockets_manifest_permission.h
index bf844da7c54609ddf1546d671838a1fad2812a70..d02c24c8833dba767873b2cba32b75affb6e6cc7 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission.h
+++ b/extensions/common/api/sockets/sockets_manifest_permission.h
@@ -22,9 +22,9 @@ class Extension;
 
 namespace extensions {
 
+typedef std::set<SocketPermissionEntry> SocketPermissionEntrySet;

[Yoyo Zhou, 2014/12/13 02:38:49]

nit: newline after

[sashab, 2014/12/14 22:54:17]

Done.

 class SocketsManifestPermission : public ManifestPermission {
  public:
-  typedef std::set<SocketPermissionEntry> SocketPermissionEntrySet;
   SocketsManifestPermission();
   ~SocketsManifestPermission() override;
 
@@ -53,21 +53,11 @@ class SocketsManifestPermission : public ManifestPermission {
 
   const SocketPermissionEntrySet& entries() const { return permissions_; }
 
- private:
-  // Add all host messages for this manifest permission into the given lists.
-  // TODO(sashab): Remove the |messages| argument from these methods, and remove
-  // the AddAllHostMessages() function (move all the logic into GetPermissions()
-  // above).
-  void AddAllHostMessages(PermissionMessages& messages,
-                          PermissionIDSet& ids) const;
-  bool AddAnyHostMessage(PermissionMessages& messages,
-                         PermissionIDSet& ids) const;
-  void AddSubdomainHostMessage(PermissionMessages& messages,
-                               PermissionIDSet& ids) const;
-  void AddSpecificHostMessage(PermissionMessages& messages,
-                              PermissionIDSet& ids) const;
-  void AddNetworkListMessage(PermissionMessages& messages,
-                             PermissionIDSet& ids) const;
+  // Adds the permissions from |sockets| to the permission lists that are not

[Yoyo Zhou, 2014/12/13 02:38:49]

nit: say |ids| and |messages| (they are not obviously 'lists')

[sashab, 2014/12/14 22:54:17]

Done.

+  // NULL. If NULL, that list is ignored.
+  static void AddSocketHostPermissions(const SocketPermissionEntrySet& sockets,
+                                       PermissionIDSet* ids,
+                                       PermissionMessages* messages);
 
   SocketPermissionEntrySet permissions_;
 };