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

remoting/protocol/jingle_stream_connector.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 "remoting/protocol/jingle_stream_connector.h"
 
 #include "base/bind.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 23 matching lines @@
 
 }  // namespace
 
 JingleStreamConnector::JingleStreamConnector(
     JingleSession* session,
     const std::string& name,
     const Session::StreamChannelCallback& callback)
     : session_(session),
       name_(name),
       callback_(callback),
-      raw_channel_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(tcp_connect_callback_(
-          this, &JingleStreamConnector::OnTCPConnect)) {
+      raw_channel_(NULL) {
 }
 
 JingleStreamConnector::~JingleStreamConnector() {
 }
 
 void JingleStreamConnector::Connect(ChannelAuthenticator* authenticator,
                                     cricket::TransportChannel* raw_channel) {
   DCHECK(CalledOnValidThread());
   DCHECK(!raw_channel_);
 
@@ skipping 19 matching lines @@
 
   // Set options for the TCP layer.
   jingle_glue::PseudoTcpAdapter* adapter =
       new jingle_glue::PseudoTcpAdapter(socket);
   adapter->SetAckDelay(kTcpAckDelayMilliseconds);
   adapter->SetNoDelay(true);
   adapter->SetReceiveBufferSize(kTcpReceiveBufferSize);
   adapter->SetSendBufferSize(kTcpSendBufferSize);
 
   tcp_socket_.reset(adapter);
-  int result = tcp_socket_->Connect(&tcp_connect_callback_);
+  int result = tcp_socket_->Connect(
+      base::Bind(&JingleStreamConnector::OnTCPConnect,
+                 base::Unretained(this)));
   if (result == net::ERR_IO_PENDING) {
     return true;
   } else if (result == net::OK) {
-    tcp_connect_callback_.Run(result);
+    OnTCPConnect(result);
     return true;
   }
 
   return false;
 }
 
 void JingleStreamConnector::OnTCPConnect(int result) {
   DCHECK(CalledOnValidThread());
 
   if (result != net::OK) {
@@ skipping 20 matching lines @@
   callback_.Run(socket);
   delete this;
 }
 
 void JingleStreamConnector::NotifyError() {
   NotifyDone(NULL);
 }
 
 }  // namespace protocol
 }  // namespace remoting