Added out-of-process support for server sockets.

content/browser/renderer_host/pepper_message_filter.cc

Index: content/browser/renderer_host/pepper_message_filter.cc
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
index f17f73c4dbcc022a0233c82d7437a49df0a1c280..1286b489445bf3c93f5f0abbe0083bb7a3ec2b4d 100644
--- a/content/browser/renderer_host/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper_message_filter.cc
@@ -590,11 +590,12 @@ void PepperMessageFilter::OnUDPClose(uint32 socket_id) {
   udp_sockets_.erase(iter);
 }
 
-void PepperMessageFilter::OnTCPServerListen(int32 routing_id,
-                                            uint32 plugin_dispatcher_id,
-                                            uint32 temp_socket_id,
-                                            const PP_NetAddress_Private& addr,
-                                            int32_t backlog) {
+void PepperMessageFilter::OnTCPServerListen(
+    int32 routing_id,
+    uint32 plugin_dispatcher_id,
+    PP_Resource socket_resource,
+    const PP_NetAddress_Private& addr,
+    int32_t backlog) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&PepperMessageFilter::DoTCPServerListen,
@@ -602,23 +603,24 @@ void PepperMessageFilter::OnTCPServerListen(int32 routing_id,
                                      CanUseSocketAPIs(routing_id),
                                      routing_id,
                                      plugin_dispatcher_id,
-                                     temp_socket_id,
+                                     socket_resource,
                                      addr,
                                      backlog));
 }
 
-void PepperMessageFilter::DoTCPServerListen(bool allowed,
-                                            int32 routing_id,
-                                            uint32 plugin_dispatcher_id,
-                                            uint32 temp_socket_id,
-                                            const PP_NetAddress_Private& addr,
-                                            int32_t backlog) {
+void PepperMessageFilter::DoTCPServerListen(
+    bool allowed,
+    int32 routing_id,
+    uint32 plugin_dispatcher_id,
+    PP_Resource socket_resource,
+    const PP_NetAddress_Private& addr,
+    int32_t backlog) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!allowed) {
     Send(new PpapiMsg_PPBTCPServerSocket_ListenACK(routing_id,
                                                    plugin_dispatcher_id,
+                                                   socket_resource,
                                                    0,
-                                                   temp_socket_id,
                                                    PP_ERROR_FAILED));
     return;
   }
@@ -626,25 +628,26 @@ void PepperMessageFilter::DoTCPServerListen(bool allowed,
   if (real_socket_id == kInvalidSocketID) {
     Send(new PpapiMsg_PPBTCPServerSocket_ListenACK(routing_id,
                                                    plugin_dispatcher_id,
-                                                   real_socket_id,
-                                                   temp_socket_id,
+                                                   socket_resource,
+                                                   0,
                                                    PP_ERROR_NOSPACE));
     return;
   }
   PepperTCPServerSocket* socket = new PepperTCPServerSocket(
-      this, routing_id, plugin_dispatcher_id, real_socket_id, temp_socket_id);
+      this, routing_id, plugin_dispatcher_id, socket_resource, real_socket_id);

[yzshen1, 2012/03/13 17:46:32]

Please change the name of real_socket_id. There isn't 'temp' ID anymore so
'real' is not necessary.

[ygorshenin1, 2012/03/14 11:36:18]

Done.

   tcp_server_sockets_[real_socket_id] =
       linked_ptr<PepperTCPServerSocket>(socket);
   socket->Listen(addr, backlog);
 }
 
-void PepperMessageFilter::OnTCPServerAccept(uint32 real_socket_id) {
+void PepperMessageFilter::OnTCPServerAccept(int32 tcp_client_sockets_routing_id,
+                                            uint32 real_socket_id) {
   TCPServerSocketMap::iterator iter = tcp_server_sockets_.find(real_socket_id);
   if (iter == tcp_server_sockets_.end()) {
     NOTREACHED();
     return;
   }
-  iter->second->Accept();
+  iter->second->Accept(tcp_client_sockets_routing_id);
 }
 
 void PepperMessageFilter::GetFontFamiliesComplete(