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

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index ff8bc505f5e73fb2cef5e95e10def7614c967739..37c03169adf85186d1085ff8ffe66a7676611266 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -1481,8 +1481,7 @@ int MockTransportClientSocketPool::RequestSocket(
       AddressList(), net_log.net_log(), net::NetLog::Source());
   CompletionCallback cb;
   if (callback) {
-    cb = base::Bind(&OldCompletionCallback::Run<int>,
-                    base::Unretained(callback));
+    cb = base::Bind(&OldCompletionCallbackAdapter, callback);
   }
   MockConnectJob* job = new MockConnectJob(socket, handle, cb);
   job_list_.push_back(job);
@@ -1491,7 +1490,7 @@ int MockTransportClientSocketPool::RequestSocket(
 }
 
 void MockTransportClientSocketPool::CancelRequest(const std::string& group_name,
-                                            ClientSocketHandle* handle) {
+                                                  ClientSocketHandle* handle) {
   std::vector<MockConnectJob*>::iterator i;
   for (i = job_list_.begin(); i != job_list_.end(); ++i) {
     if ((*i)->CancelHandle(handle)) {