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

net/udp/udp_socket_libevent.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_UDP_UDP_SOCKET_LIBEVENT_H_
 #define NET_UDP_UDP_SOCKET_LIBEVENT_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
   // Read from the socket.
   // Only usable from the client-side of a UDP socket, after the socket
   // has been connected.
   int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
   int Read(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
 
   // Write to the socket.
   // Only usable from the client-side of a UDP socket, after the socket
   // has been connected.
   int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
-  int Write(IOBuffer* buf, int buf_len, const CompletionCallback& callback);
 
   // Read from a socket and receive sender address information.
   // |buf| is the buffer to read data into.
   // |buf_len| is the maximum amount of data to read.
   // |address| is a buffer provided by the caller for receiving the sender
   //   address information about the received data.  This buffer must be kept
   //   alive by the caller until the callback is placed.
   // |address_length| is a ptr to the length of the |address| buffer.  This
   //   is an input parameter containing the maximum size |address| can hold
   //   and also an output parameter for the size of |address| upon completion.
@@ skipping 59 matching lines @@
 
   class WriteWatcher : public MessageLoopForIO::Watcher {
    public:
     explicit WriteWatcher(UDPSocketLibevent* socket) : socket_(socket) {}
 
     // MessageLoopForIO::Watcher methods
 
     virtual void OnFileCanReadWithoutBlocking(int /* fd */) OVERRIDE {}
 
     virtual void OnFileCanWriteWithoutBlocking(int /* fd */) OVERRIDE {
-      if (socket_->old_write_callback_)
+      if (socket_->write_callback_)
         socket_->DidCompleteWrite();
     }
 
    private:
     UDPSocketLibevent* const socket_;
 
     DISALLOW_COPY_AND_ASSIGN(WriteWatcher);
   };
 
   void DoReadCallback(int rv);
@@ skipping 12 matching lines @@
   // Returns the OS error code (or 0 on success).
   int CreateSocket(const IPEndPoint& address);
 
   // Same as SendTo(), except that address is passed by pointer
   // instead of by reference. It is called from Write() with |address|
   // set to NULL.
   int SendToOrWrite(IOBuffer* buf,
                     int buf_len,
                     const IPEndPoint* address,
                     OldCompletionCallback* callback);
-  int SendToOrWrite(IOBuffer* buf,
-                    int buf_len,
-                    const IPEndPoint* address,
-                    const CompletionCallback& callback);
 
   int InternalConnect(const IPEndPoint& address);
   int InternalRecvFrom(IOBuffer* buf, int buf_len, IPEndPoint* address);
   int InternalSendTo(IOBuffer* buf, int buf_len, const IPEndPoint* address);
 
   int DoBind(const IPEndPoint& address);
   int RandomBind(const IPEndPoint& address);
 
   int socket_;
 
@@ skipping 25 matching lines @@
   // The buffer used by InternalWrite() to retry Write requests
   scoped_refptr<IOBuffer> write_buf_;
   int write_buf_len_;
   scoped_ptr<IPEndPoint> send_to_address_;
 
   // External callback; called when read is complete.
   OldCompletionCallback* old_read_callback_;
   CompletionCallback read_callback_;
 
   // External callback; called when write is complete.
-  OldCompletionCallback* old_write_callback_;
-  CompletionCallback write_callback_;
+  OldCompletionCallback* write_callback_;
 
   BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(UDPSocketLibevent);
 };
 
 }  // namespace net
 
 #endif  // NET_UDP_UDP_SOCKET_LIBEVENT_H_