Remove BindStateHolder and have Bind() return a Callback<> object directly.

net/http/http_proxy_client_socket.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/http/http_proxy_client_socket.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/auth.h"
@@ skipping 55 matching lines @@
   DCHECK_EQ(STATE_NONE, next_state_);
   DCHECK(user_callback_.is_null());
 
   int rv = PrepareForAuthRestart();
   if (rv != OK || next_state_ == STATE_NONE)
     return rv;
 
   rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING)
     if (callback) {
-      user_callback_ = base::Bind(&OldCompletionCallback::Run<int>,
-                                  base::Unretained(callback));
+      user_callback_ = base::Bind(&OldCompletionCallbackAdapter, callback);
     }
   return rv;
 }
 
 const
 scoped_refptr<HttpAuthController>& HttpProxyClientSocket::auth_controller() {
   return auth_;
 }
 
 const HttpResponseInfo* HttpProxyClientSocket::GetConnectResponseInfo() const {
@@ skipping 380 matching lines @@
 
   if (http_stream_parser_->IsResponseBodyComplete())
     return DidDrainBodyForAuthRestart(true);
 
   // Keep draining.
   next_state_ = STATE_DRAIN_BODY;
   return OK;
 }
 
 }  // namespace net