| Index: net/http/http_proxy_client_socket_pool.cc
|
| diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
|
| index 7b1f960ca6688720dd8e4467e57b73aa6f217556..1915f6e6d7156210e93e3098af889bf36e7b8a3e 100644
|
| --- a/net/http/http_proxy_client_socket_pool.cc
|
| +++ b/net/http/http_proxy_client_socket_pool.cc
|
| @@ -86,8 +86,6 @@ HttpProxyConnectJob::HttpProxyConnectJob(
|
| ALLOW_THIS_IN_INITIALIZER_LIST(
|
| callback_(base::Bind(&HttpProxyConnectJob::OnIOComplete,
|
| base::Unretained(this)))),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - callback_old_(this, &HttpProxyConnectJob::OnIOComplete)),
|
| using_spdy_(false) {
|
| }
|
|
|
| @@ -309,10 +307,9 @@ int HttpProxyConnectJob::DoSpdyProxyCreateStream() {
|
| }
|
|
|
| next_state_ = STATE_SPDY_PROXY_CREATE_STREAM_COMPLETE;
|
| - return spdy_session->CreateStream(params_->request_url(),
|
| - params_->destination().priority(),
|
| - &spdy_stream_, spdy_session->net_log(),
|
| - &callback_old_);
|
| + return spdy_session->CreateStream(
|
| + params_->request_url(), params_->destination().priority(),
|
| + &spdy_stream_, spdy_session->net_log(), callback_);
|
| }
|
|
|
| int HttpProxyConnectJob::DoSpdyProxyCreateStreamComplete(int result) {
|
| @@ -407,12 +404,10 @@ HttpProxyClientSocketPool::~HttpProxyClientSocketPool() {
|
| transport_pool_->RemoveLayeredPool(this);
|
| }
|
|
|
| -int HttpProxyClientSocketPool::RequestSocket(const std::string& group_name,
|
| - const void* socket_params,
|
| - RequestPriority priority,
|
| - ClientSocketHandle* handle,
|
| - OldCompletionCallback* callback,
|
| - const BoundNetLog& net_log) {
|
| +int HttpProxyClientSocketPool::RequestSocket(
|
| + const std::string& group_name, const void* socket_params,
|
| + RequestPriority priority, ClientSocketHandle* handle,
|
| + const CompletionCallback& callback, const BoundNetLog& net_log) {
|
| const scoped_refptr<HttpProxySocketParams>* casted_socket_params =
|
| static_cast<const scoped_refptr<HttpProxySocketParams>*>(socket_params);
|
|
|
|
|