TCPSockets are switched to the new Pepper proxy.

ppapi/proxy/tcp_server_socket_private_resource.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/tcp_server_socket_private_resource.h"
 
 #include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
+#include "ppapi/proxy/tcp_socket_private_resource.h"
 
 namespace ppapi {
 namespace proxy {
 
 TCPServerSocketPrivateResource::TCPServerSocketPrivateResource(
     Connection connection,
     PP_Instance instance)
     : PluginResource(connection, instance),
       state_(STATE_BEFORE_LISTENING),
-      local_addr_(),
-      plugin_dispatcher_id_(0) {
+      local_addr_() {
   SendCreate(BROWSER, PpapiHostMsg_TCPServerSocket_CreatePrivate());
-
-  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
-  if (dispatcher)
-    plugin_dispatcher_id_ = dispatcher->plugin_dispatcher_id();
-  else
-    NOTREACHED();
 }
 
 TCPServerSocketPrivateResource::~TCPServerSocketPrivateResource() {
 }
 
 thunk::PPB_TCPServerSocket_Private_API*
 TCPServerSocketPrivateResource::AsPPB_TCPServerSocket_Private_API() {
   return this;
 }
 
@@ skipping 26 matching lines @@
     return PP_ERROR_BADARGUMENT;
   if (state_ != STATE_LISTENING)
     return PP_ERROR_FAILED;
   if (TrackedCallback::IsPending(accept_callback_))
     return PP_ERROR_INPROGRESS;
 
   accept_callback_ = callback;
 
   Call<PpapiPluginMsg_TCPServerSocket_AcceptReply>(
       BROWSER,
-      PpapiHostMsg_TCPServerSocket_Accept(plugin_dispatcher_id_),
+      PpapiHostMsg_TCPServerSocket_Accept(),
       base::Bind(&TCPServerSocketPrivateResource::OnPluginMsgAcceptReply,
                  base::Unretained(this), tcp_socket));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t TCPServerSocketPrivateResource::GetLocalAddress(
     PP_NetAddress_Private* addr) {
   if (!addr)
     return PP_ERROR_BADARGUMENT;
   if (state_ != STATE_LISTENING)
@@ skipping 23 matching lines @@
   if (params.result() == PP_OK) {
     local_addr_ = local_addr;
     state_ = STATE_LISTENING;
   }
   listen_callback_->Run(params.result());
 }
 
 void TCPServerSocketPrivateResource::OnPluginMsgAcceptReply(
     PP_Resource* tcp_socket,
     const ResourceMessageReplyParams& params,
-    uint32 accepted_socket_id,
+    int pending_resource_id,
     const PP_NetAddress_Private& local_addr,
     const PP_NetAddress_Private& remote_addr) {
   DCHECK(tcp_socket);
   if (state_ != STATE_LISTENING ||
       !TrackedCallback::IsPending(accept_callback_)) {
     return;
   }
   if (params.result() == PP_OK) {
-    *tcp_socket =
-        PPB_TCPSocket_Private_Proxy::CreateProxyResourceForConnectedSocket(
-            pp_instance(),
-            accepted_socket_id,
-            local_addr,
-            remote_addr);
+    Connection connection(PluginGlobals::Get()->GetBrowserSender(),

[yzshen1, 2013/08/16 20:40:42]

TCPServerSocketPrivateResource itself has a connection() accessor, please use it
directly.
(and then you don't need to add #include, either.)

[ygorshenin1, 2013/08/19 14:33:35]

Done.

+                          PluginDispatcher::GetForInstance(pp_instance()));
+    *tcp_socket = (new TCPSocketPrivateResource(connection, pp_instance(),
+                                                pending_resource_id,
+                                                local_addr,
+                                                remote_addr))->GetReference();
   }
   accept_callback_->Run(params.result());
 }
 
 }  // namespace proxy
 }  // namespace ppapi