Index: jingle/notifier/base/fake_ssl_client_socket.h |
diff --git a/jingle/notifier/base/fake_ssl_client_socket.h b/jingle/notifier/base/fake_ssl_client_socket.h |
index 623e21b2265f19e6558d374ef650c31e0521f035..3e428cd6c6e5919eaab43df3fa45cc8ef6b36716 100644 |
--- a/jingle/notifier/base/fake_ssl_client_socket.h |
+++ b/jingle/notifier/base/fake_ssl_client_socket.h |
@@ -47,14 +47,11 @@ class FakeSSLClientSocket : public net::StreamSocket { |
// net::StreamSocket 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; |
- virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; |
virtual int Connect(const net::CompletionCallback& callback) OVERRIDE; |
virtual void Disconnect() OVERRIDE; |
virtual bool IsConnected() const OVERRIDE; |
@@ -93,13 +90,6 @@ class FakeSSLClientSocket : public net::StreamSocket { |
void OnVerifyServerHelloDone(int status); |
net::Error ProcessVerifyServerHelloDone(size_t read); |
- // Callbacks passed to |transport_socket_|. |
- net::OldCompletionCallbackImpl<FakeSSLClientSocket> connect_callback_; |
- net::OldCompletionCallbackImpl<FakeSSLClientSocket> |
- send_client_hello_callback_; |
- net::OldCompletionCallbackImpl<FakeSSLClientSocket> |
- verify_server_hello_callback_; |
- |
scoped_ptr<net::StreamSocket> transport_socket_; |
// During the handshake process, holds a value from HandshakeState. |
@@ -110,7 +100,6 @@ class FakeSSLClientSocket : public net::StreamSocket { |
bool handshake_completed_; |
// The callback passed to Connect(). |
- net::OldCompletionCallback* old_user_connect_callback_; |
net::CompletionCallback user_connect_callback_; |
scoped_refptr<net::DrainableIOBuffer> write_buf_; |