diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 01:14:52 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 01:14:52 +0000 |
| commit | 6ecf2b9599dca0403a485cbf56bf6c9763681148 (patch) | |
| tree | d8c108a197067ff7d9af24c19a52dfcc6ee4f926 /net/socket/ssl_client_socket_pool.cc | |
| parent | bbf8a1c1044f290dea937d6fb53170fbbba0f899 (diff) | |
| download | chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.zip chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.gz chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.bz2 | |
base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps.
BUG=none
TEST=none
R=csilv
Review URL: http://codereview.chromium.org/8898036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_pool.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc index 744eb38..fb91d07 100644 --- a/net/socket/ssl_client_socket_pool.cc +++ b/net/socket/ssl_client_socket_pool.cc @@ -4,6 +4,8 @@ #include "net/socket/ssl_client_socket_pool.h" +#include "base/bind.h" +#include "base/bind_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/values.h" @@ -95,9 +97,7 @@ SSLConnectJob::SSLConnectJob(const std::string& group_name, context_(context), ALLOW_THIS_IN_INITIALIZER_LIST( callback_(base::Bind(&SSLConnectJob::OnIOComplete, - base::Unretained(this)))), - ALLOW_THIS_IN_INITIALIZER_LIST( - callback_old_(this, &SSLConnectJob::OnIOComplete)) {} + base::Unretained(this)))) {} SSLConnectJob::~SSLConnectJob() {} @@ -207,10 +207,9 @@ int SSLConnectJob::DoTransportConnect() { scoped_refptr<TransportSocketParams> transport_params = params_->transport_params(); return transport_socket_handle_->Init( - group_name(), - transport_params, - transport_params->destination().priority(), - &callback_old_, transport_pool_, net_log()); + group_name(), transport_params, + transport_params->destination().priority(), callback_, transport_pool_, + net_log()); } int SSLConnectJob::DoTransportConnectComplete(int result) { @@ -225,9 +224,9 @@ int SSLConnectJob::DoSOCKSConnect() { next_state_ = STATE_SOCKS_CONNECT_COMPLETE; transport_socket_handle_.reset(new ClientSocketHandle()); scoped_refptr<SOCKSSocketParams> socks_params = params_->socks_params(); - return transport_socket_handle_->Init(group_name(), socks_params, - socks_params->destination().priority(), - &callback_old_, socks_pool_, net_log()); + return transport_socket_handle_->Init( + group_name(), socks_params, socks_params->destination().priority(), + callback_, socks_pool_, net_log()); } int SSLConnectJob::DoSOCKSConnectComplete(int result) { @@ -246,8 +245,8 @@ int SSLConnectJob::DoTunnelConnect() { params_->http_proxy_params(); return transport_socket_handle_->Init( group_name(), http_proxy_params, - http_proxy_params->destination().priority(), &callback_old_, - http_proxy_pool_, net_log()); + http_proxy_params->destination().priority(), callback_, http_proxy_pool_, + net_log()); } int SSLConnectJob::DoTunnelConnectComplete(int result) { |