Index: net/socket/transport_client_socket_pool.cc |
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc |
index a423ebd48f4b85be673d02c08ed2e8e9b4f8b20b..faf12df1e699f88ebd4b947ebccb8ecb8eb3a51e 100644 |
--- a/net/socket/transport_client_socket_pool.cc |
+++ b/net/socket/transport_client_socket_pool.cc |
@@ -99,14 +99,7 @@ TransportConnectJob::TransportConnectJob( |
BoundNetLog::Make(net_log, NetLog::SOURCE_CONNECT_JOB)), |
params_(params), |
client_socket_factory_(client_socket_factory), |
- ALLOW_THIS_IN_INITIALIZER_LIST( |
- callback_(this, |
- &TransportConnectJob::OnIOComplete)), |
- resolver_(host_resolver), |
- ALLOW_THIS_IN_INITIALIZER_LIST( |
- fallback_callback_( |
- this, |
- &TransportConnectJob::DoIPv6FallbackTransportConnectComplete)) {} |
+ resolver_(host_resolver) {} |
TransportConnectJob::~TransportConnectJob() { |
// We don't worry about cancelling the host resolution and TCP connect, since |
@@ -216,7 +209,8 @@ int TransportConnectJob::DoTransportConnect() { |
transport_socket_.reset(client_socket_factory_->CreateTransportClientSocket( |
addresses_, net_log().net_log(), net_log().source())); |
connect_start_time_ = base::TimeTicks::Now(); |
- int rv = transport_socket_->Connect(&callback_); |
+ int rv = transport_socket_->Connect( |
+ base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this))); |
if (rv == ERR_IO_PENDING && |
AddressListStartsWithIPv6AndHasAnIPv4Addr(addresses_)) { |
fallback_timer_.Start(FROM_HERE, |
@@ -296,7 +290,10 @@ void TransportConnectJob::DoIPv6FallbackTransportConnect() { |
client_socket_factory_->CreateTransportClientSocket( |
*fallback_addresses_, net_log().net_log(), net_log().source())); |
fallback_connect_start_time_ = base::TimeTicks::Now(); |
- int rv = fallback_transport_socket_->Connect(&fallback_callback_); |
+ int rv = fallback_transport_socket_->Connect( |
+ base::Bind( |
+ &TransportConnectJob::DoIPv6FallbackTransportConnectComplete, |
+ base::Unretained(this))); |
if (rv != ERR_IO_PENDING) |
DoIPv6FallbackTransportConnectComplete(rv); |
} |