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

jingle/glue/pseudotcp_adapter.cc

Index: jingle/glue/pseudotcp_adapter.cc
===================================================================
--- jingle/glue/pseudotcp_adapter.cc	(revision 113718)
+++ jingle/glue/pseudotcp_adapter.cc	(working copy)
@@ -35,8 +35,6 @@
            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();
@@ -77,8 +75,7 @@
   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_;
@@ -103,7 +100,7 @@
 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),
@@ -167,7 +164,7 @@
 
 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);
@@ -181,29 +178,6 @@
   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;
   }
 
@@ -257,8 +231,7 @@
   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();
@@ -324,7 +297,7 @@
 
 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_);
@@ -337,17 +310,10 @@
 
   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) {
@@ -373,14 +339,10 @@
     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));
   }
 }
 
@@ -518,11 +480,6 @@
   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());
Property changes on: jingle/glue/pseudotcp_adapter.cc
___________________________________________________________________
Deleted: svn:mergeinfo