Use extensions socket permission for TCP/UDP socket APIs in Pepper

chrome/common/extensions/permissions/socket_permission_data.h

 // Copyright (c) 2012 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.
 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_DATA_H_
 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_DATA_H_
 
 #include <string>
 
+#include "content/public/browser/socket_permission_request.h"
+
 namespace extensions {
 
 // A pattern that can be used to match socket permission.
 //   <socket-permission-pattern>
 //          := <op> |
 //             <op> ':' <host> |
 //             <op> ':' ':' <port> |
 //             <op> ':' <host> ':' <port>
 //   <op>   := 'tcp-connect' |
 //             'tcp-listen' |
 //             'udp-bind' |
 //             'udp-send-to'
 //   <host> := '*' |
 //             '*.' <anychar except '/' and '*'>+ |
 //             <anychar except '/' and '*'>+
 //   <port> := '*' |
 //             <port number between 0 and 65535>)
 class SocketPermissionData {
  public:
-  enum OperationType {
-    NONE = 0,
-    TCP_CONNECT,
-    TCP_LISTEN,
-    UDP_BIND,
-    UDP_SEND_TO,
-  };
-
   enum HostType {
     ANY_HOST,
     HOSTS_IN_DOMAINS,
     SPECIFIC_HOSTS,
   };
 
   SocketPermissionData();
   ~SocketPermissionData();
 
   // operators <, == are needed by container std::set and algorithms
   // std::set_includes and std::set_differences.
   bool operator<(const SocketPermissionData& rhs) const;
   bool operator==(const SocketPermissionData& rhs) const;
 
-  bool Match(OperationType type, const std::string& host, int port) const;
+  bool Match(content::SocketPermissionRequest request) const;
 
   bool Parse(const std::string& permission);
 
   HostType GetHostType() const;
   const std::string GetHost() const;
 
   const std::string& GetAsString() const;
 
  private:
   void Reset();
 
-  OperationType type_;
+  content::SocketPermissionRequest::OperationType type_;

[jam, 2012/10/18 15:37:15]

why only bring in the enum here? i.e. why not the whole SocketPermissionRequest
struct and remove host_/port_ below? (that's what i had meant by duplication)

[dpolukhin, 2012/10/18 18:01:00]

This class represents pattern for matching not a request. I did replace
<type,host,port> with new struct in SocketPermission::CheckParam (see
chrome/common/extensions/permissions/socket_permission.h, it was the
duplication).

[jam, 2012/10/18 18:17:06]

I'm not sure I follow the distinction, i.e. why does that make a difference of
whether this struct reuses an enum but not other members of the content struct,
vs using the whole struct?

[dpolukhin, 2012/10/18 18:30:34]

New SocketPermissionRequest has 1:1: correspondence with
SocketPermission::CheckParam and there I eliminated duplication. Patter and
request are different things even if they both have members with the same names.

[jam, 2012/10/18 21:21:34]

so it's just a coincidence that they both have host_ and port_ members?

[Dmitry Polukhin, 2012/10/19 09:24:00]

They are related but not the same. But I did it because you insist. IMHO, it
makes all accesses longer and doesn't increase code readability.

   std::string host_;
   bool match_subdomains_;
   int port_;
   mutable std::string spec_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_DATA_H_