Index: net/socket/socks5_client_socket.cc |
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc |
index ea5fc7aaf4a9be740379e0c9ac9e69e57e322b40..3497e24adcba94df21aebc747f4fc210329ce4d2 100644 |
--- a/net/socket/socks5_client_socket.cc |
+++ b/net/socket/socks5_client_socket.cc |
@@ -204,10 +204,18 @@ int SOCKS5ClientSocket::Read(IOBuffer* buf, int buf_len, |
// Write is called by the transport layer. This can only be done if the |
// SOCKS handshake is complete. |
int SOCKS5ClientSocket::Write(IOBuffer* buf, int buf_len, |
- OldCompletionCallback* callback) { |
+ 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()->Write(buf, buf_len, callback); |
+} |
+int SOCKS5ClientSocket::Write(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()->Write(buf, buf_len, callback); |
} |