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

remoting/jingle_glue/ssl_socket_adapter.h

 // 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.
 
 #ifndef REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_
 #define REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
@@ skipping 22 matching lines @@
  public:
   TransportSocket(talk_base::AsyncSocket* socket,
                   SSLSocketAdapter *ssl_adapter);
   virtual ~TransportSocket();
 
   void set_addr(const talk_base::SocketAddress& addr) {
     addr_ = addr;
   }
 
   // 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;
   virtual bool IsConnectedAndIdle() const OVERRIDE;
   virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE;
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
   virtual const net::BoundNetLog& NetLog() const OVERRIDE;
   virtual void SetSubresourceSpeculation() OVERRIDE;
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual int64 NumBytesRead() const OVERRIDE;
   virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
 
   // 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;
 
  private:
   friend class SSLSocketAdapter;
 
   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_;
   scoped_refptr<net::IOBuffer> write_buffer_;
   int write_buffer_len_;
 
   net::BoundNetLog net_log_;
 
   talk_base::AsyncSocket *socket_;
   talk_base::SocketAddress addr_;
@@ skipping 49 matching lines @@
 
   bool ignore_bad_cert_;
   std::string hostname_;
   TransportSocket* transport_socket_;
 
   // |cert_verifier_| must be defined before |ssl_socket_|, so that
   // it's destroyed after |ssl_socket_|.
   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_;
   scoped_refptr<net::IOBuffer> transport_buf_;
   int data_transferred_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLSocketAdapter);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_JINGLE_GLUE_SSL_SOCKET_ADAPTER_H_