base::Bind: Convert most of net/http.

net/socket/socket_test_util.h

Index: net/socket/socket_test_util.h
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index adb8ea9f3d909780e5b9596a426ea023b4160579..2d3646cc536f7e2aef7ca31299b31bc2eccb6ce5 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -344,10 +344,6 @@ class OrderedSocketData : public StaticSocketDataProvider,
                     MockRead* reads, size_t reads_count,
                     MockWrite* writes, size_t writes_count);
 
-  void SetCompletionCallback(const CompletionCallback& callback) {
-    callback_ = callback;
-  }
-
   // Posts a quit message to the current message loop, if one is running.
   void EndLoop();
 
@@ -363,7 +359,6 @@ class OrderedSocketData : public StaticSocketDataProvider,
 
   int sequence_number_;
   int loop_stop_stage_;
-  CompletionCallback callback_;
   bool blocked_;
   base::WeakPtrFactory<OrderedSocketData> weak_factory_;
 };
@@ -941,12 +936,12 @@ class MockTransportClientSocketPool : public TransportClientSocketPool {
   int release_count() const { return release_count_; }
   int cancel_count() const { return cancel_count_; }
 
-  // TransportClientSocketPool methods.
+  // TransportClientSocketPool implementation.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_params,
                             RequestPriority priority,
                             ClientSocketHandle* handle,
-                            OldCompletionCallback* callback,
+                            const CompletionCallback& callback,
                             const BoundNetLog& net_log) OVERRIDE;
 
   virtual void CancelRequest(const std::string& group_name,
@@ -1020,12 +1015,12 @@ class MockSOCKSClientSocketPool : public SOCKSClientSocketPool {
 
   virtual ~MockSOCKSClientSocketPool();
 
-  // SOCKSClientSocketPool methods.
+  // SOCKSClientSocketPool implementation.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_params,
                             RequestPriority priority,
                             ClientSocketHandle* handle,
-                            OldCompletionCallback* callback,
+                            const CompletionCallback& callback,
                             const BoundNetLog& net_log) OVERRIDE;
 
   virtual void CancelRequest(const std::string& group_name,