Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

remoting/jingle_glue/ssl_socket_adapter.h

Index: remoting/jingle_glue/ssl_socket_adapter.h
diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h
index f929bf83e75931b5f51bee8a572a5d209a079ef4..ea8cff15b1ff8bbf794e0fefcb8f2b91f4694160 100644
--- a/remoting/jingle_glue/ssl_socket_adapter.h
+++ b/remoting/jingle_glue/ssl_socket_adapter.h
@@ -40,7 +40,6 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
   }
 
   // net::StreamSocket implementation.
-  virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE;
   virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
@@ -57,11 +56,9 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   net::OldCompletionCallback* callback) OVERRIDE;
-  virtual int Read(net::IOBuffer* buf, int buf_len,
                    const net::CompletionCallback& callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    net::OldCompletionCallback* callback) OVERRIDE;
+                    const net::CompletionCallback& callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
@@ -71,9 +68,9 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> {
   void OnReadEvent(talk_base::AsyncSocket* socket);
   void OnWriteEvent(talk_base::AsyncSocket* socket);
 
-  net::OldCompletionCallback* old_read_callback_;
+  // Holds the user's completion callback when Write and Read are called.
   net::CompletionCallback read_callback_;
-  net::OldCompletionCallback* write_callback_;
+  net::CompletionCallback write_callback_;
 
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_len_;
@@ -143,9 +140,6 @@ class SSLSocketAdapter : public talk_base::SSLAdapter {
   scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_ptr<net::SSLClientSocket> ssl_socket_;
 
-  net::OldCompletionCallbackImpl<SSLSocketAdapter> connected_callback_;
-  net::OldCompletionCallbackImpl<SSLSocketAdapter> read_callback_;
-  net::OldCompletionCallbackImpl<SSLSocketAdapter> write_callback_;
   SSLState ssl_state_;
   IOState read_state_;
   IOState write_state_;