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

content/common/p2p_messages.h

Index: content/common/p2p_messages.h
diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h
index 7c847a5741eea818e5be153ebcac69749570deee..59f6a8f629a8aea087c275a3c21e850247537049 100644
--- a/content/common/p2p_messages.h
+++ b/content/common/p2p_messages.h
@@ -24,56 +24,56 @@ IPC_STRUCT_TRAITS_END()
 
 // P2P Socket messages sent from the browser to the renderer.
 
-IPC_MESSAGE_ROUTED1(P2PMsg_NetworkListChanged,
-                    net::NetworkInterfaceList /* networks */)
+IPC_MESSAGE_CONTROL1(P2PMsg_NetworkListChanged,
+                     net::NetworkInterfaceList /* networks */)
 
-IPC_MESSAGE_ROUTED2(P2PMsg_GetHostAddressResult,
-                    int32 /* request_id */,
-                    net::IPAddressNumber /* address */)
+IPC_MESSAGE_CONTROL2(P2PMsg_GetHostAddressResult,
+                     int32 /* request_id */,
+                     net::IPAddressNumber /* address */)
 
-IPC_MESSAGE_ROUTED2(P2PMsg_OnSocketCreated,
-                    int /* socket_id */,
-                    net::IPEndPoint /* socket_address */)
+IPC_MESSAGE_CONTROL2(P2PMsg_OnSocketCreated,
+                     int /* socket_id */,
+                     net::IPEndPoint /* socket_address */)
 
-IPC_MESSAGE_ROUTED1(P2PMsg_OnError,
-                    int /* socket_id */)
+IPC_MESSAGE_CONTROL1(P2PMsg_OnError,
+                     int /* socket_id */)
 
-IPC_MESSAGE_ROUTED2(P2PMsg_OnIncomingTcpConnection,
-                    int /* socket_id */,
-                    net::IPEndPoint /* socket_address */)
+IPC_MESSAGE_CONTROL2(P2PMsg_OnIncomingTcpConnection,
+                     int /* socket_id */,
+                     net::IPEndPoint /* socket_address */)
 
-IPC_MESSAGE_ROUTED3(P2PMsg_OnDataReceived,
-                    int /* socket_id */,
-                    net::IPEndPoint /* socket_address */,
-                    std::vector<char> /* data */)
+IPC_MESSAGE_CONTROL3(P2PMsg_OnDataReceived,
+                     int /* socket_id */,
+                     net::IPEndPoint /* socket_address */,
+                     std::vector<char> /* data */)
 
 // P2P Socket messages sent from the renderer to the browser.
 
 // Start/stop sending P2PMsg_NetworkListChanged messages when network
 // configuration changes.
-IPC_MESSAGE_ROUTED0(P2PHostMsg_StartNetworkNotifications)
-IPC_MESSAGE_ROUTED0(P2PHostMsg_StopNetworkNotifications)
+IPC_MESSAGE_CONTROL0(P2PHostMsg_StartNetworkNotifications)
+IPC_MESSAGE_CONTROL0(P2PHostMsg_StopNetworkNotifications)
 
-IPC_MESSAGE_ROUTED2(P2PHostMsg_GetHostAddress,
+IPC_MESSAGE_CONTROL2(P2PHostMsg_GetHostAddress,
                     std::string /* host_name */,
                     int32 /* request_id */)
 
-IPC_MESSAGE_ROUTED4(P2PHostMsg_CreateSocket,
-                    content::P2PSocketType /* type */,
-                    int /* socket_id */,
-                    net::IPEndPoint /* local_address */,
-                    net::IPEndPoint /* remote_address */)
+IPC_MESSAGE_CONTROL4(P2PHostMsg_CreateSocket,
+                     content::P2PSocketType /* type */,
+                     int /* socket_id */,
+                     net::IPEndPoint /* local_address */,
+                     net::IPEndPoint /* remote_address */)
 
-IPC_MESSAGE_ROUTED3(P2PHostMsg_AcceptIncomingTcpConnection,
+IPC_MESSAGE_CONTROL3(P2PHostMsg_AcceptIncomingTcpConnection,
                     int /* listen_socket_id */,
                     net::IPEndPoint /* remote_address */,
                     int /* connected_socket_id */)
 
 // TODO(sergeyu): Use shared memory to pass the data.
-IPC_MESSAGE_ROUTED3(P2PHostMsg_Send,
-                    int /* socket_id */,
-                    net::IPEndPoint /* socket_address */,
-                    std::vector<char> /* data */)
+IPC_MESSAGE_CONTROL3(P2PHostMsg_Send,
+                     int /* socket_id */,
+                     net::IPEndPoint /* socket_address */,
+                     std::vector<char> /* data */)
 
-IPC_MESSAGE_ROUTED1(P2PHostMsg_DestroySocket,
-                    int /* socket_id */)
+IPC_MESSAGE_CONTROL1(P2PHostMsg_DestroySocket,
+                     int /* socket_id */)