Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

content/renderer/p2p/p2p_transport_impl.cc

 // Copyright (c) 2011 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 "content/renderer/p2p/p2p_transport_impl.h"
 
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/ipc_socket_factory.h"
 #include "content/renderer/p2p/port_allocator.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
 #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
 
 namespace content {
 
 P2PTransportImpl::P2PTransportImpl(
     talk_base::NetworkManager* network_manager,
     talk_base::PacketSocketFactory* socket_factory)
     : socket_dispatcher_(NULL),
       event_handler_(NULL),
       state_(STATE_NONE),
       network_manager_(network_manager),
-      socket_factory_(socket_factory),
-      ALLOW_THIS_IN_INITIALIZER_LIST(connect_callback_(
-          this, &P2PTransportImpl::OnTcpConnected)) {
+      socket_factory_(socket_factory) {
 }
 
 P2PTransportImpl::P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher)
     : socket_dispatcher_(socket_dispatcher),
       event_handler_(NULL),
       state_(STATE_NONE),
       network_manager_(new IpcNetworkManager(socket_dispatcher)),
-      socket_factory_(new IpcPacketSocketFactory(socket_dispatcher)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(connect_callback_(
-          this, &P2PTransportImpl::OnTcpConnected)) {
+      socket_factory_(new IpcPacketSocketFactory(socket_dispatcher)) {
   DCHECK(socket_dispatcher);
 }
 
 P2PTransportImpl::~P2PTransportImpl() {
 }
 
 bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame,
                             const std::string& name,
                             Protocol protocol,
                             const Config& config,
@@ skipping 44 matching lines @@
         channel_adapter_.release()));
 
     if (config.tcp_receive_window > 0)
       pseudo_tcp_adapter_->SetReceiveBufferSize(config.tcp_receive_window);
     if (config.tcp_send_window > 0)
       pseudo_tcp_adapter_->SetReceiveBufferSize(config.tcp_receive_window);
     pseudo_tcp_adapter_->SetNoDelay(config.tcp_no_delay);
     if (config.tcp_ack_delay_ms > 0)
       pseudo_tcp_adapter_->SetAckDelay(config.tcp_ack_delay_ms);
 
-    int result = pseudo_tcp_adapter_->Connect(&connect_callback_);
+    int result = pseudo_tcp_adapter_->Connect(
+        base::Bind(&P2PTransportImpl::OnTcpConnected, base::Unretained(this)));
     if (result != net::ERR_IO_PENDING)
       OnTcpConnected(result);
   }
 
   return true;
 }
 
 bool P2PTransportImpl::AddRemoteCandidate(const std::string& address) {
   cricket::Candidate candidate;
   if (!jingle_glue::DeserializeP2PCandidate(address, &candidate)) {
@@ skipping 39 matching lines @@
 void P2PTransportImpl::OnTcpConnected(int result) {
   if (result < 0) {
     event_handler_->OnError(result);
     return;
   }
   state_ = static_cast<State>(STATE_READABLE | STATE_WRITABLE);
   event_handler_->OnStateChange(state_);
 }
 
 }  // namespace content