Revert 113699 - base::Bind: Convert Socket::Write.

net/socket/socks5_client_socket.cc

Index: net/socket/socks5_client_socket.cc
===================================================================
--- net/socket/socks5_client_socket.cc	(revision 113718)
+++ net/socket/socks5_client_socket.cc	(working copy)
@@ -204,22 +204,14 @@
 // 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_ && user_callback_.is_null());
+  DCHECK(!old_user_callback_);
 
   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);
-}
-
 bool SOCKS5ClientSocket::SetReceiveBufferSize(int32 size) {
   return transport_->socket()->SetReceiveBufferSize(size);
 }
Property changes on: net/socket/socks5_client_socket.cc
___________________________________________________________________
Deleted: svn:mergeinfo