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

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
===================================================================
--- net/socket/socket_test_util.cc	(revision 114494)
+++ net/socket/socket_test_util.cc	(working copy)
@@ -1481,7 +1481,8 @@
       AddressList(), net_log.net_log(), net::NetLog::Source());
   CompletionCallback cb;
   if (callback) {
-    cb = base::Bind(&OldCompletionCallbackAdapter, callback);
+    cb = base::Bind(&OldCompletionCallback::Run<int>,
+                    base::Unretained(callback));
   }
   MockConnectJob* job = new MockConnectJob(socket, handle, cb);
   job_list_.push_back(job);
@@ -1490,7 +1491,7 @@
 }
 
 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)) {