| Index: jingle/notifier/base/fake_ssl_client_socket.cc
|
| ===================================================================
|
| --- jingle/notifier/base/fake_ssl_client_socket.cc (revision 113718)
|
| +++ jingle/notifier/base/fake_ssl_client_socket.cc (working copy)
|
| @@ -112,17 +112,11 @@
|
| }
|
|
|
| int FakeSSLClientSocket::Write(net::IOBuffer* buf, int buf_len,
|
| - net::OldCompletionCallback* callback) {
|
| + net::OldCompletionCallback* callback) {
|
| DCHECK_EQ(next_handshake_state_, STATE_NONE);
|
| DCHECK(handshake_completed_);
|
| return transport_socket_->Write(buf, buf_len, callback);
|
| }
|
| -int FakeSSLClientSocket::Write(net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) {
|
| - DCHECK_EQ(next_handshake_state_, STATE_NONE);
|
| - DCHECK(handshake_completed_);
|
| - return transport_socket_->Write(buf, buf_len, callback);
|
| -}
|
|
|
| bool FakeSSLClientSocket::SetReceiveBufferSize(int32 size) {
|
| return transport_socket_->SetReceiveBufferSize(size);
|
|
|
| Property changes on: jingle/notifier/base/fake_ssl_client_socket.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|