| 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 9a5af5431158ecaeca2146b9897f7d015d7c8f49..9061abef53e1c7a5ecf3834054b49741004345f9 100644
|
| --- a/jingle/notifier/base/fake_ssl_client_socket.h
|
| +++ b/jingle/notifier/base/fake_ssl_client_socket.h
|
| @@ -53,6 +53,7 @@ class FakeSSLClientSocket : public net::StreamSocket {
|
| 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;
|
| virtual bool IsConnectedAndIdle() const OVERRIDE;
|
| @@ -107,7 +108,8 @@ class FakeSSLClientSocket : public net::StreamSocket {
|
| bool handshake_completed_;
|
|
|
| // The callback passed to Connect().
|
| - net::OldCompletionCallback* user_connect_callback_;
|
| + net::OldCompletionCallback* old_user_connect_callback_;
|
| + net::CompletionCallback user_connect_callback_;
|
|
|
| scoped_refptr<net::DrainableIOBuffer> write_buf_;
|
| scoped_refptr<net::DrainableIOBuffer> read_buf_;
|
|
|