| Index: net/socket/socks_client_socket.cc
|
| diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
|
| index a4c4b4770946f62c133d7c8afbe5ca1ff267a009..623f202af4f7cfe82a8242e7a8d56e07d116e10c 100644
|
| --- a/net/socket/socks_client_socket.cc
|
| +++ b/net/socket/socks_client_socket.cc
|
| @@ -216,7 +216,15 @@ int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
|
| OldCompletionCallback* callback) {
|
| DCHECK(completed_handshake_);
|
| DCHECK_EQ(STATE_NONE, next_state_);
|
| - DCHECK(!old_user_callback_);
|
| + DCHECK(!old_user_callback_ && user_callback_.is_null());
|
| +
|
| + return transport_->socket()->Read(buf, buf_len, callback);
|
| +}
|
| +int SOCKSClientSocket::Read(IOBuffer* buf, int buf_len,
|
| + const CompletionCallback& callback) {
|
| + DCHECK(completed_handshake_);
|
| + DCHECK_EQ(STATE_NONE, next_state_);
|
| + DCHECK(!old_user_callback_ && user_callback_.is_null());
|
|
|
| return transport_->socket()->Read(buf, buf_len, callback);
|
| }
|
|
|