Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

content/browser/renderer_host/p2p/socket_host_tcp_server.cc

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 9b4f1e31b9dc6bd2695c49e040c0b501e36a2eb2..206a0e431f1098e156d7f9f5ba19393ac1845208 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.cc
@@ -21,9 +21,8 @@ const int kListenBacklog = 5;
 namespace content {
 
 P2PSocketHostTcpServer::P2PSocketHostTcpServer(
-    IPC::Sender* message_sender,
-    int routing_id, int id)
-    : P2PSocketHost(message_sender, routing_id, id),
+    IPC::Sender* message_sender, int id)
+    : P2PSocketHost(message_sender, id),
       socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())),
       ALLOW_THIS_IN_INITIALIZER_LIST(accept_callback_(
           base::Bind(&P2PSocketHostTcpServer::OnAccepted,
@@ -61,8 +60,7 @@ bool P2PSocketHostTcpServer::Init(const net::IPEndPoint& local_address,
   VLOG(1) << "Local address: " << local_address_.ToString();
 
   state_ = STATE_OPEN;
-  message_sender_->Send(new P2PMsg_OnSocketCreated(routing_id_, id_,
-                                                   local_address_));
+  message_sender_->Send(new P2PMsg_OnSocketCreated(id_, local_address_));
   DoAccept();
   return true;
 }
@@ -71,7 +69,7 @@ void P2PSocketHostTcpServer::OnError() {
   socket_.reset();
 
   if (state_ == STATE_UNINITIALIZED || state_ == STATE_OPEN)
-    message_sender_->Send(new P2PMsg_OnError(routing_id_, id_));
+    message_sender_->Send(new P2PMsg_OnError(id_));
 
   state_ = STATE_ERROR;
 }
@@ -106,7 +104,7 @@ void P2PSocketHostTcpServer::HandleAcceptResult(int result) {
 
   accepted_sockets_[address] = accept_socket_.release();
   message_sender_->Send(
-      new P2PMsg_OnIncomingTcpConnection(routing_id_, id_, address));
+      new P2PMsg_OnIncomingTcpConnection(id_, address));
 }
 
 void P2PSocketHostTcpServer::OnAccepted(int result) {
@@ -130,7 +128,7 @@ P2PSocketHost* P2PSocketHostTcpServer::AcceptIncomingTcpConnection(
   net::StreamSocket* socket = it->second;
   accepted_sockets_.erase(it);
   scoped_ptr<P2PSocketHostTcp> result(
-      new P2PSocketHostTcp(message_sender_, routing_id_, id));
+      new P2PSocketHostTcp(message_sender_, id));
   if (!result->InitAccepted(remote_address, socket))
     return NULL;