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

net/udp/udp_socket_win.cc

Index: net/udp/udp_socket_win.cc
===================================================================
--- net/udp/udp_socket_win.cc	(revision 113718)
+++ net/udp/udp_socket_win.cc	(working copy)
@@ -52,7 +52,7 @@
       ALLOW_THIS_IN_INITIALIZER_LIST(write_delegate_(this)),
       recv_from_address_(NULL),
       old_read_callback_(NULL),
-      old_write_callback_(NULL),
+      write_callback_(NULL),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_UDP_SOCKET)) {
   EnsureWinsockInit();
   scoped_refptr<NetLog::EventParameters> params;
@@ -82,8 +82,7 @@
   old_read_callback_ = NULL;
   read_callback_.Reset();
   recv_from_address_ = NULL;
-  old_write_callback_ = NULL;
-  write_callback_.Reset();
+  write_callback_ = NULL;
 
   read_watcher_.StopWatching();
   write_watcher_.StopWatching();
@@ -193,11 +192,6 @@
                         OldCompletionCallback* callback) {
   return SendToOrWrite(buf, buf_len, NULL, callback);
 }
-int UDPSocketWin::Write(IOBuffer* buf,
-                        int buf_len,
-                        const CompletionCallback& callback) {
-  return SendToOrWrite(buf, buf_len, NULL, callback);
-}
 
 int UDPSocketWin::SendTo(IOBuffer* buf,
                          int buf_len,
@@ -212,7 +206,7 @@
                                 OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(INVALID_SOCKET, socket_);
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
+  DCHECK(!write_callback_);
   DCHECK(callback);  // Synchronous operation not supported.
   DCHECK_GT(buf_len, 0);
   DCHECK(!send_to_address_.get());
@@ -224,27 +218,6 @@
   if (address)
     send_to_address_.reset(new IPEndPoint(*address));
   write_iobuffer_ = buf;
-  old_write_callback_ = callback;
-  return ERR_IO_PENDING;
-}
-int UDPSocketWin::SendToOrWrite(IOBuffer* buf,
-                                int buf_len,
-                                const IPEndPoint* address,
-                                const CompletionCallback& callback) {
-  DCHECK(CalledOnValidThread());
-  DCHECK_NE(INVALID_SOCKET, socket_);
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
-  DCHECK(!callback.is_null());  // Synchronous operation not supported.
-  DCHECK_GT(buf_len, 0);
-  DCHECK(!send_to_address_.get());
-
-  int nwrite = InternalSendTo(buf, buf_len, address);
-  if (nwrite != ERR_IO_PENDING)
-    return nwrite;
-
-  if (address)
-    send_to_address_.reset(new IPEndPoint(*address));
-  write_iobuffer_ = buf;
   write_callback_ = callback;
   return ERR_IO_PENDING;
 }
@@ -341,18 +314,12 @@
 
 void UDPSocketWin::DoWriteCallback(int rv) {
   DCHECK_NE(rv, ERR_IO_PENDING);
-  DCHECK(old_write_callback_ && !write_callback_.is_null());
+  DCHECK(write_callback_);
 
   // since Run may result in Write being called, clear write_callback_ up front.
-  if (old_write_callback_) {
-    OldCompletionCallback* c = old_write_callback_;
-    old_write_callback_ = NULL;
-    c->Run(rv);
-  } else {
-    CompletionCallback c = write_callback_;
-    write_callback_.Reset();
-    c.Run(rv);
-  }
+  OldCompletionCallback* c = write_callback_;
+  write_callback_ = NULL;
+  c->Run(rv);
 }
 
 void UDPSocketWin::DidCompleteRead() {