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

chrome/common/extensions/permissions/socket_permission_data.cc

Index: chrome/common/extensions/permissions/socket_permission_data.cc
diff --git a/chrome/common/extensions/permissions/socket_permission_data.cc b/chrome/common/extensions/permissions/socket_permission_data.cc
index 4b8b689223d91052abe4381eecd1a3a1b7b2ab1d..2a89cc074422fb142eb61a0007780b0c81c29676 100644
--- a/chrome/common/extensions/permissions/socket_permission_data.cc
+++ b/chrome/common/extensions/permissions/socket_permission_data.cc
@@ -16,6 +16,7 @@
 
 namespace {
 
+using content::SocketPermissionRequest;
 using extensions::SocketPermissionData;
 
 const char kColon = ':';
@@ -29,27 +30,27 @@ const char kUDPSendTo[] = "udp-send-to";
 const int kAnyPort = 0;
 const int kInvalidPort = -1;
 
-SocketPermissionData::OperationType StringToType(const std::string& s) {
+SocketPermissionRequest::OperationType StringToType(const std::string& s) {
   if (s == kTCPConnect)
-    return SocketPermissionData::TCP_CONNECT;
+    return SocketPermissionRequest::TCP_CONNECT;
   if (s == kTCPListen)
-    return SocketPermissionData::TCP_LISTEN;
+    return SocketPermissionRequest::TCP_LISTEN;
   if (s == kUDPBind)
-    return SocketPermissionData::UDP_BIND;
+    return SocketPermissionRequest::UDP_BIND;
   if (s == kUDPSendTo)
-    return SocketPermissionData::UDP_SEND_TO;
-  return SocketPermissionData::NONE;
+    return SocketPermissionRequest::UDP_SEND_TO;
+  return SocketPermissionRequest::NONE;
 }
 
-const char* TypeToString(SocketPermissionData::OperationType type) {
+const char* TypeToString(SocketPermissionRequest::OperationType type) {
   switch (type) {
-    case SocketPermissionData::TCP_CONNECT:
+    case SocketPermissionRequest::TCP_CONNECT:
       return kTCPConnect;
-    case SocketPermissionData::TCP_LISTEN:
+    case SocketPermissionRequest::TCP_LISTEN:
       return kTCPListen;
-    case SocketPermissionData::UDP_BIND:
+    case SocketPermissionRequest::UDP_BIND:
       return kUDPBind;
-    case SocketPermissionData::UDP_SEND_TO:
+    case SocketPermissionRequest::UDP_SEND_TO:
       return kUDPSendTo;
     default:
       return kInvalid;
@@ -102,12 +103,11 @@ bool SocketPermissionData::operator==(const SocketPermissionData& rhs) const {
       (port_ == rhs.port_);
 }
 
-bool SocketPermissionData::Match(
-    OperationType type, const std::string& host, int port) const {
-  if (type_ != type)
+bool SocketPermissionData::Match(SocketPermissionRequest request) const {
+  if (type_ != request.type)
     return false;
 
-  std::string lhost = StringToLowerASCII(host);
+  std::string lhost = StringToLowerASCII(request.host);
   if (host_ != lhost) {
     if (!match_subdomains_)
       return false;
@@ -135,7 +135,7 @@ bool SocketPermissionData::Match(
     }
   }
 
-  if (port_ != port && port_ != kAnyPort)
+  if (port_ != request.port && port_ != kAnyPort)
     return false;
 
   return true;
@@ -155,7 +155,7 @@ bool SocketPermissionData::Parse(const std::string& permission) {
       break;
 
     type_ = StringToType(tokens[0]);
-    if (type_ == NONE)
+    if (type_ == SocketPermissionRequest::NONE)
       break;
 
     if (tokens.size() == 1)
@@ -231,7 +231,7 @@ const std::string& SocketPermissionData::GetAsString() const {
 }
 
 void SocketPermissionData::Reset() {
-  type_ = NONE;
+  type_ = SocketPermissionRequest::NONE;
   host_.clear();
   match_subdomains_ = false;
   port_ = kInvalidPort;