| Index: net/socket/socks_client_socket.cc
|
| ===================================================================
|
| --- net/socket/socks_client_socket.cc (revision 113718)
|
| +++ net/socket/socks_client_socket.cc (working copy)
|
| @@ -235,19 +235,11 @@
|
| OldCompletionCallback* callback) {
|
| DCHECK(completed_handshake_);
|
| DCHECK_EQ(STATE_NONE, next_state_);
|
| - DCHECK(!old_user_callback_ && user_callback_.is_null());
|
| + DCHECK(!old_user_callback_);
|
|
|
| return transport_->socket()->Write(buf, buf_len, callback);
|
| }
|
| -int SOCKSClientSocket::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);
|
| -}
|
| -
|
| bool SOCKSClientSocket::SetReceiveBufferSize(int32 size) {
|
| return transport_->socket()->SetReceiveBufferSize(size);
|
| }
|
|
|
| Property changes on: net/socket/socks_client_socket.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|