| Index: net/socket/socks5_client_socket.cc
|
| diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
|
| index c9d2825dd447068bf74a8383087c4d7ff008d735..ea5fc7aaf4a9be740379e0c9ac9e69e57e322b40 100644
|
| --- a/net/socket/socks5_client_socket.cc
|
| +++ b/net/socket/socks5_client_socket.cc
|
| @@ -188,7 +188,15 @@ int SOCKS5ClientSocket::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 SOCKS5ClientSocket::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);
|
| }
|
|
|