Index: content/browser/renderer_host/p2p/socket_host_tcp_server.cc |
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc |
index f2d2da9984613b0159d20aa71dfdc31554e916ab..2418de9e87cc042a2b58ffa2733c567b6e980466 100644 |
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc |
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc |
@@ -20,14 +20,14 @@ const int kListenBacklog = 5; |
namespace content { |
-P2PSocketHostTcpServer::P2PSocketHostTcpServer( |
- IPC::Sender* message_sender, int id, P2PSocketType client_type) |
- : P2PSocketHost(message_sender, id), |
+P2PSocketHostTcpServer::P2PSocketHostTcpServer(IPC::Sender* message_sender, |
+ int socket_id, |
+ P2PSocketType client_type) |
+ : P2PSocketHost(message_sender, socket_id), |
client_type_(client_type), |
socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())), |
- accept_callback_( |
- base::Bind(&P2PSocketHostTcpServer::OnAccepted, |
- base::Unretained(this))) { |
+ accept_callback_(base::Bind(&P2PSocketHostTcpServer::OnAccepted, |
+ base::Unretained(this))) { |
} |
P2PSocketHostTcpServer::~P2PSocketHostTcpServer() { |
@@ -135,8 +135,8 @@ P2PSocketHost* P2PSocketHostTcpServer::AcceptIncomingTcpConnection( |
if (client_type_ == P2P_SOCKET_TCP_CLIENT) { |
result.reset(new P2PSocketHostTcp(message_sender_, id, client_type_, NULL)); |
} else { |
- result.reset(new P2PSocketHostStunTcp( |
- message_sender_, id, client_type_, NULL)); |
+ result.reset( |
+ new P2PSocketHostStunTcp(message_sender_, id, client_type_, NULL)); |
} |
if (!result->InitAccepted(remote_address, socket)) |
return NULL; |