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

jingle/glue/pseudotcp_adapter.cc

 // 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.
 
 #include "jingle/glue/pseudotcp_adapter.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "net/base/address_list.h"
@@ skipping 17 matching lines @@
   Core(net::Socket* socket);
   virtual ~Core();
 
   // Functions used to implement net::StreamSocket.
   int Read(net::IOBuffer* buffer, int buffer_size,
            net::OldCompletionCallback* callback);
   int Read(net::IOBuffer* buffer, int buffer_size,
            const net::CompletionCallback& callback);
   int Write(net::IOBuffer* buffer, int buffer_size,
             net::OldCompletionCallback* callback);
-  int Write(net::IOBuffer* buffer, int buffer_size,
-            const net::CompletionCallback& callback);
   int Connect(net::OldCompletionCallback* callback);
   int Connect(const net::CompletionCallback& callback);
   void Disconnect();
   bool IsConnected() const;
 
   // cricket::IPseudoTcpNotify interface.
   // These notifications are triggered from NotifyPacket.
   virtual void OnTcpOpen(cricket::PseudoTcp* tcp) OVERRIDE;
   virtual void OnTcpReadable(cricket::PseudoTcp* tcp) OVERRIDE;
   virtual void OnTcpWriteable(cricket::PseudoTcp* tcp) OVERRIDE;
@@ skipping 20 matching lines @@
   void HandleReadResults(int result);
   void HandleTcpClock();
 
   // This re-sets |timer| without triggering callbacks.
   void AdjustClock();
 
   net::OldCompletionCallback* old_connect_callback_;
   net::CompletionCallback connect_callback_;
   net::OldCompletionCallback* old_read_callback_;
   net::CompletionCallback read_callback_;
-  net::OldCompletionCallback* old_write_callback_;
-  net::CompletionCallback write_callback_;
+  net::OldCompletionCallback* write_callback_;
 
   cricket::PseudoTcp pseudo_tcp_;
   scoped_ptr<net::Socket> socket_;
 
   scoped_refptr<net::IOBuffer> read_buffer_;
   int read_buffer_size_;
   scoped_refptr<net::IOBuffer> write_buffer_;
   int write_buffer_size_;
 
   bool socket_write_pending_;
   scoped_refptr<net::IOBuffer> socket_read_buffer_;
 
   net::OldCompletionCallbackImpl<Core> socket_read_callback_;
   net::OldCompletionCallbackImpl<Core> socket_write_callback_;
 
   base::OneShotTimer<Core> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 
 PseudoTcpAdapter::Core::Core(net::Socket* socket)
     : old_connect_callback_(NULL),
       old_read_callback_(NULL),
-      old_write_callback_(NULL),
+      write_callback_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(pseudo_tcp_(this, 0)),
       socket_(socket),
       socket_write_pending_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           socket_read_callback_(this, &PseudoTcpAdapter::Core::OnRead)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           socket_write_callback_(this, &PseudoTcpAdapter::Core::OnWritten)) {
   // Doesn't trigger callbacks.
   pseudo_tcp_.NotifyMTU(kDefaultMtu);
 }
@@ skipping 43 matching lines @@
     read_callback_ = callback;
   }
 
   AdjustClock();
 
   return result;
 }
 
 int PseudoTcpAdapter::Core::Write(net::IOBuffer* buffer, int buffer_size,
                                   net::OldCompletionCallback* callback) {
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
+  DCHECK(!write_callback_);
 
   // Reference the Core in case a callback deletes the adapter.
   scoped_refptr<Core> core(this);
 
   int result = pseudo_tcp_.Send(buffer->data(), buffer_size);
   if (result < 0) {
     result = net::MapSystemError(pseudo_tcp_.GetError());
     DCHECK(result < 0);
   }
 
   if (result == net::ERR_IO_PENDING) {
     write_buffer_ = buffer;
     write_buffer_size_ = buffer_size;
-    old_write_callback_ = callback;
-  }
-
-  AdjustClock();
-
-  return result;
-}
-int PseudoTcpAdapter::Core::Write(net::IOBuffer* buffer, int buffer_size,
-                                  const net::CompletionCallback& callback) {
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
-
-  // Reference the Core in case a callback deletes the adapter.
-  scoped_refptr<Core> core(this);
-
-  int result = pseudo_tcp_.Send(buffer->data(), buffer_size);
-  if (result < 0) {
-    result = net::MapSystemError(pseudo_tcp_.GetError());
-    DCHECK(result < 0);
-  }
-
-  if (result == net::ERR_IO_PENDING) {
-    write_buffer_ = buffer;
-    write_buffer_size_ = buffer_size;
     write_callback_ = callback;
   }
 
   AdjustClock();
 
   return result;
 }
 
 int PseudoTcpAdapter::Core::Connect(net::OldCompletionCallback* callback) {
   DCHECK_EQ(pseudo_tcp_.State(), cricket::PseudoTcp::TCP_LISTEN);
@@ skipping 33 matching lines @@
   DoReadFromSocket();
 
   return net::ERR_IO_PENDING;
 }
 
 void PseudoTcpAdapter::Core::Disconnect() {
   // Don't dispatch outstanding callbacks, as mandated by net::StreamSocket.
   old_read_callback_ = NULL;
   read_callback_.Reset();
   read_buffer_ = NULL;
-  old_write_callback_ = NULL;
-  write_callback_.Reset();
+  write_callback_ = NULL;
   write_buffer_ = NULL;
   old_connect_callback_ = NULL;
   connect_callback_.Reset();
 
   // TODO(wez): Connect should succeed if called after Disconnect, which
   // PseudoTcp doesn't support, so we need to teardown the internal PseudoTcp
   // and create a new one in Connect.
   // TODO(wez): Close sets a shutdown flag inside PseudoTcp but has no other
   // effect.  This should be addressed in PseudoTcp, really.
   // In the meantime we can fake OnTcpClosed notification and tear down the
@@ skipping 45 matching lines @@
   } else {
     net::CompletionCallback callback = read_callback_;
     read_callback_.Reset();
     read_buffer_ = NULL;
     callback.Run(result);
   }
 }
 
 void PseudoTcpAdapter::Core::OnTcpWriteable(PseudoTcp* tcp) {
   DCHECK_EQ(tcp, &pseudo_tcp_);
-  if (!old_write_callback_ && write_callback_.is_null())
+  if (!write_callback_)
     return;
 
   int result = pseudo_tcp_.Send(write_buffer_->data(), write_buffer_size_);
   if (result < 0) {
     result = net::MapSystemError(pseudo_tcp_.GetError());
     DCHECK(result < 0);
     if (result == net::ERR_IO_PENDING)
       return;
   }
 
   AdjustClock();
 
-  if (old_write_callback_) {
-    net::OldCompletionCallback* callback = old_write_callback_;
-    old_write_callback_ = NULL;
-    write_buffer_ = NULL;
-    callback->Run(result);
-  } else {
-    net::CompletionCallback callback = write_callback_;
-    write_callback_.Reset();
-    write_buffer_ = NULL;
-    callback.Run(result);
-  }
+  net::OldCompletionCallback* callback = write_callback_;
+  write_callback_ = NULL;
+  write_buffer_ = NULL;
+  callback->Run(result);
 }
 
 void PseudoTcpAdapter::Core::OnTcpClosed(PseudoTcp* tcp, uint32 error) {
   DCHECK_EQ(tcp, &pseudo_tcp_);
 
   if (old_connect_callback_) {
     net::OldCompletionCallback* callback = old_connect_callback_;
     old_connect_callback_ = NULL;
     callback->Run(net::MapSystemError(error));
   } else if (!connect_callback_.is_null()) {
     net::CompletionCallback callback = connect_callback_;
     connect_callback_.Reset();
     callback.Run(net::MapSystemError(error));
   }
 
   if (old_read_callback_) {
     net::OldCompletionCallback* callback = old_read_callback_;
     old_read_callback_ = NULL;
     callback->Run(net::MapSystemError(error));
   } else if (!read_callback_.is_null()) {
     net::CompletionCallback callback = read_callback_;
     read_callback_.Reset();
     callback.Run(net::MapSystemError(error));
   }
 
-  if (old_write_callback_) {
-    net::OldCompletionCallback* callback = old_write_callback_;
-    old_write_callback_ = NULL;
+  if (write_callback_) {
+    net::OldCompletionCallback* callback = write_callback_;
+    write_callback_ = NULL;
     callback->Run(net::MapSystemError(error));
-  } else if (!write_callback_.is_null()) {
-    net::CompletionCallback callback = write_callback_;
-    write_callback_.Reset();
-    callback.Run(net::MapSystemError(error));
   }
 }
 
 void PseudoTcpAdapter::Core::SetAckDelay(int delay_ms) {
   pseudo_tcp_.SetOption(cricket::PseudoTcp::OPT_ACKDELAY, delay_ms);
 }
 
 void PseudoTcpAdapter::Core::SetNoDelay(bool no_delay) {
   pseudo_tcp_.SetOption(cricket::PseudoTcp::OPT_NODELAY, no_delay ? 1 : 0);
 }
@@ skipping 117 matching lines @@
                            const net::CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   return core_->Read(buffer, buffer_size, callback);
 }
 
 int PseudoTcpAdapter::Write(net::IOBuffer* buffer, int buffer_size,
                             net::OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
   return core_->Write(buffer, buffer_size, callback);
 }
-int PseudoTcpAdapter::Write(net::IOBuffer* buffer, int buffer_size,
-                            const net::CompletionCallback& callback) {
-  DCHECK(CalledOnValidThread());
-  return core_->Write(buffer, buffer_size, callback);
-}
 
 bool PseudoTcpAdapter::SetReceiveBufferSize(int32 size) {
   DCHECK(CalledOnValidThread());
 
   core_->SetReceiveBufferSize(size);
   return false;
 }
 
 bool PseudoTcpAdapter::SetSendBufferSize(int32 size) {
   DCHECK(CalledOnValidThread());
@@ skipping 93 matching lines @@
   DCHECK(CalledOnValidThread());
   core_->SetAckDelay(delay_ms);
 }
 
 void PseudoTcpAdapter::SetNoDelay(bool no_delay) {
   DCHECK(CalledOnValidThread());
   core_->SetNoDelay(no_delay);
 }
 
 }  // namespace jingle_glue