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

chrome/browser/extensions/api/socket/socket_api.cc

Index: chrome/browser/extensions/api/socket/socket_api.cc
diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc
index 42743df03a579820c7e0026f55f841ae0a32d562..fea0ad771baaa1f3100c4a778a4cc90047f5e16b 100644
--- a/chrome/browser/extensions/api/socket/socket_api.cc
+++ b/chrome/browser/extensions/api/socket/socket_api.cc
@@ -23,6 +23,8 @@
 
 namespace extensions {
 
+using content::SocketPermissionRequest;
+
 const char kAddressKey[] = "address";
 const char kPortKey[] = "port";
 const char kBytesWrittenKey[] = "bytesWritten";
@@ -182,17 +184,17 @@ void SocketConnectFunction::AsyncWorkStart() {
     return;
   }
 
-  SocketPermissionData::OperationType operation_type;
+  SocketPermissionRequest::OperationType operation_type;
   switch (socket_->GetSocketType()) {
     case Socket::TYPE_TCP:
-      operation_type = SocketPermissionData::TCP_CONNECT;
+      operation_type = SocketPermissionRequest::TCP_CONNECT;
       break;
     case Socket::TYPE_UDP:
-      operation_type = SocketPermissionData::UDP_SEND_TO;
+      operation_type = SocketPermissionRequest::UDP_SEND_TO;
       break;
     default:
       NOTREACHED() << "Unknown socket type.";
-      operation_type = SocketPermissionData::NONE;
+      operation_type = SocketPermissionRequest::NONE;
       break;
   }
 
@@ -260,7 +262,7 @@ void SocketBindFunction::Work() {
 
   if (socket->GetSocketType() == Socket::TYPE_UDP) {
     SocketPermission::CheckParam param(
-        SocketPermissionData::UDP_BIND, address_, port_);
+        SocketPermissionRequest::UDP_BIND, address_, port_);
     if (!GetExtension()->CheckAPIPermissionWithParam(APIPermission::kSocket,
           &param)) {
       error_ = kPermissionError;
@@ -300,7 +302,7 @@ void SocketListenFunction::Work() {
   Socket* socket = GetSocket(params_->socket_id);
   if (socket) {
     SocketPermission::CheckParam param(
-        SocketPermissionData::TCP_LISTEN, params_->address, params_->port);
+        SocketPermissionRequest::TCP_LISTEN, params_->address, params_->port);
     if (!GetExtension()->CheckAPIPermissionWithParam(APIPermission::kSocket,
           &param)) {
       error_ = kPermissionError;
@@ -518,7 +520,7 @@ void SocketSendToFunction::AsyncWorkStart() {
   }
 
   if (socket_->GetSocketType() == Socket::TYPE_UDP) {
-    SocketPermission::CheckParam param(SocketPermissionData::UDP_SEND_TO,
+    SocketPermission::CheckParam param(SocketPermissionRequest::UDP_SEND_TO,
         hostname_, port_);
     if (!GetExtension()->CheckAPIPermissionWithParam(APIPermission::kSocket,
           &param)) {