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

net/socket/socks_client_socket_pool.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 "net/socket/socks_client_socket_pool.h"
 
 #include "base/time.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 #include "net/socket/client_socket_factory.h"
@@ skipping 33 matching lines @@
     TransportClientSocketPool* transport_pool,
     HostResolver* host_resolver,
     Delegate* delegate,
     NetLog* net_log)
     : ConnectJob(group_name, timeout_duration, delegate,
                  BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)),
       socks_params_(socks_params),
       transport_pool_(transport_pool),
       resolver_(host_resolver),
       ALLOW_THIS_IN_INITIALIZER_LIST(
-          callback_(this, &SOCKSConnectJob::OnIOComplete)) {
+          callback_old_(this, &SOCKSConnectJob::OnIOComplete)) {
 }
 
 SOCKSConnectJob::~SOCKSConnectJob() {
   // We don't worry about cancelling the tcp socket since the destructor in
   // scoped_ptr<ClientSocketHandle> transport_socket_handle_ will take care of
   // it.
 }
 
 LoadState SOCKSConnectJob::GetLoadState() const {
   switch (next_state_) {
@@ skipping 46 matching lines @@
 
   return rv;
 }
 
 int SOCKSConnectJob::DoTransportConnect() {
   next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE;
   transport_socket_handle_.reset(new ClientSocketHandle());
   return transport_socket_handle_->Init(group_name(),
                                         socks_params_->transport_params(),
                                         socks_params_->destination().priority(),
-                                        &callback_,
+                                        &callback_old_,
                                         transport_pool_,
                                         net_log());
 }
 
 int SOCKSConnectJob::DoTransportConnectComplete(int result) {
   if (result != OK)
     return ERR_PROXY_CONNECTION_FAILED;
 
   // Reset the timer to just the length of time allowed for SOCKS handshake
   // so that a fast TCP connection plus a slow SOCKS failure doesn't take
   // longer to timeout than it should.
   ResetTimer(base::TimeDelta::FromSeconds(kSOCKSConnectJobTimeoutInSeconds));
   next_state_ = STATE_SOCKS_CONNECT;
   return result;
 }
 
 int SOCKSConnectJob::DoSOCKSConnect() {
   next_state_ = STATE_SOCKS_CONNECT_COMPLETE;
 
   // Add a SOCKS connection on top of the tcp socket.
   if (socks_params_->is_socks_v5()) {
     socket_.reset(new SOCKS5ClientSocket(transport_socket_handle_.release(),
                                          socks_params_->destination()));
   } else {
     socket_.reset(new SOCKSClientSocket(transport_socket_handle_.release(),
                                         socks_params_->destination(),
                                         resolver_));
   }
-  return socket_->Connect(&callback_);
+  return socket_->Connect(
+      base::Bind(&SOCKSConnectJob::OnIOComplete, base::Unretained(this)));
 }
 
 int SOCKSConnectJob::DoSOCKSConnectComplete(int result) {
   if (result != OK) {
     socket_->Disconnect();
     return result;
   }
 
   set_socket(socket_.release());
   return result;
@@ skipping 139 matching lines @@
   return base_.histograms();
 };
 
 bool SOCKSClientSocketPool::CloseOneIdleConnection() {
   if (base_.CloseOneIdleSocket())
     return true;
   return base_.CloseOneIdleConnectionInLayeredPool();
 }
 
 }  // namespace net