Index: content/browser/renderer_host/pepper_tcp_server_socket.cc |
diff --git a/content/browser/renderer_host/pepper_tcp_server_socket.cc b/content/browser/renderer_host/pepper_tcp_server_socket.cc |
index b108d0f61da79d36e26689680e45274212857a11..67dd4fe8c86a7587f4e78e33cc7b4d601472290b 100644 |
--- a/content/browser/renderer_host/pepper_tcp_server_socket.cc |
+++ b/content/browser/renderer_host/pepper_tcp_server_socket.cc |
@@ -57,7 +57,7 @@ void PepperTCPServerSocket::Listen(const PP_NetAddress_Private& addr, |
OnListenCompleted(result); |
} |
-void PepperTCPServerSocket::Accept() { |
+void PepperTCPServerSocket::Accept(int32 tcp_client_sockets_routing_id) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
if (state_ != LISTENING) { |
@@ -70,9 +70,10 @@ void PepperTCPServerSocket::Accept() { |
int result = socket_->Accept( |
&socket_buffer_, |
base::Bind(&PepperTCPServerSocket::OnAcceptCompleted, |
- base::Unretained(this))); |
+ base::Unretained(this), |
+ tcp_client_sockets_routing_id)); |
if (result != net::ERR_IO_PENDING) |
- OnAcceptCompleted(result); |
+ OnAcceptCompleted(tcp_client_sockets_routing_id, result); |
} |
void PepperTCPServerSocket::CancelListenRequest() { |
@@ -115,7 +116,9 @@ void PepperTCPServerSocket::OnListenCompleted(int result) { |
} |
} |
-void PepperTCPServerSocket::OnAcceptCompleted(int result) { |
+void PepperTCPServerSocket::OnAcceptCompleted( |
+ int32 tcp_client_sockets_routing_id, |
+ int result) { |
DCHECK(state_ == ACCEPT_IN_PROGRESS && socket_buffer_.get()); |
if (result != net::OK) { |
@@ -139,7 +142,7 @@ void PepperTCPServerSocket::OnAcceptCompleted(int result) { |
SendAcceptACKError(); |
} else { |
uint32 accepted_socket_id = |
- manager_->AddAcceptedTCPSocket(routing_id_, |
+ manager_->AddAcceptedTCPSocket(tcp_client_sockets_routing_id, |
plugin_dispatcher_id_, |
socket.release()); |
if (accepted_socket_id != 0) { |