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

jingle/glue/channel_socket_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/channel_socket_adapter.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
 
 namespace jingle_glue {
 
 TransportChannelSocketAdapter::TransportChannelSocketAdapter(
     cricket::TransportChannel* channel)
     : message_loop_(MessageLoop::current()),
       channel_(channel),
       old_read_callback_(NULL),
-      old_write_callback_(NULL),
+      write_callback_(NULL),
       closed_error_code_(net::OK) {
   DCHECK(channel_);
 
   channel_->SignalReadPacket.connect(
       this, &TransportChannelSocketAdapter::OnNewPacket);
   channel_->SignalWritableState.connect(
       this, &TransportChannelSocketAdapter::OnWritableState);
   channel_->SignalDestroyed.connect(
       this, &TransportChannelSocketAdapter::OnChannelDestroyed);
 }
@@ skipping 33 matching lines @@
   }
 
   read_callback_ = callback;
   read_buffer_ = buf;
   read_buffer_size_ = buffer_size;
 
   return net::ERR_IO_PENDING;
 }
 
 int TransportChannelSocketAdapter::Write(
-    net::IOBuffer* buffer, int buffer_size,
-    net::OldCompletionCallback* callback) {
+    net::IOBuffer* buffer, int buffer_size, net::OldCompletionCallback* callback) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(buffer);
   DCHECK(callback);
-  CHECK(!old_write_callback_ && write_callback_.is_null());
+  CHECK(!write_callback_);
 
   if (!channel_) {
     DCHECK(closed_error_code_ != net::OK);
     return closed_error_code_;
   }
 
   int result;
   if (channel_->writable()) {
     result = channel_->SendPacket(buffer->data(), buffer_size);
     if (result < 0) {
       result = net::MapSystemError(channel_->GetError());
 
       // If the underlying socket returns IO pending where it shouldn't we
       // pretend the packet is dropped and return as succeeded because no
       // writeable callback will happen.
       if (result == net::ERR_IO_PENDING)
         result = net::OK;
     }
   } else {
     // Channel is not writable yet.
     result = net::ERR_IO_PENDING;
-    old_write_callback_ = callback;
-    write_buffer_ = buffer;
-    write_buffer_size_ = buffer_size;
-  }
-
-  return result;
-}
-int TransportChannelSocketAdapter::Write(
-    net::IOBuffer* buffer, int buffer_size,
-    const net::CompletionCallback& callback) {
-  DCHECK_EQ(MessageLoop::current(), message_loop_);
-  DCHECK(buffer);
-  DCHECK(!callback.is_null());
-  CHECK(!old_write_callback_ && write_callback_.is_null());
-
-  if (!channel_) {
-    DCHECK(closed_error_code_ != net::OK);
-    return closed_error_code_;
-  }
-
-  int result;
-  if (channel_->writable()) {
-    result = channel_->SendPacket(buffer->data(), buffer_size);
-    if (result < 0) {
-      result = net::MapSystemError(channel_->GetError());
-
-      // If the underlying socket returns IO pending where it shouldn't we
-      // pretend the packet is dropped and return as succeeded because no
-      // writeable callback will happen.
-      if (result == net::ERR_IO_PENDING)
-        result = net::OK;
-    }
-  } else {
-    // Channel is not writable yet.
-    result = net::ERR_IO_PENDING;
     write_callback_ = callback;
     write_buffer_ = buffer;
     write_buffer_size_ = buffer_size;
   }
 
   return result;
 }
 
 bool TransportChannelSocketAdapter::SetReceiveBufferSize(int32 size) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
@@ skipping 22 matching lines @@
     old_read_callback_ = NULL;
     read_buffer_ = NULL;
     callback->Run(error_code);
   } else if (!read_callback_.is_null()) {
     net::CompletionCallback callback = read_callback_;
     read_callback_.Reset();
     read_buffer_ = NULL;
     callback.Run(error_code);
   }
 
-  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;
     write_buffer_ = NULL;
     callback->Run(error_code);
-  } else if (!write_callback_.is_null()) {
-    net::CompletionCallback callback = write_callback_;
-    write_callback_.Reset();
-    write_buffer_ = NULL;
-    callback.Run(error_code);
   }
 }
 
 void TransportChannelSocketAdapter::OnNewPacket(
     cricket::TransportChannel* channel, const char* data, size_t data_size) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
   if (old_read_callback_ || !read_callback_.is_null()) {
     DCHECK(read_buffer_);
     CHECK_LT(data_size, static_cast<size_t>(std::numeric_limits<int>::max()));
@@ skipping 20 matching lines @@
   } else {
     LOG(WARNING)
         << "Data was received without a callback. Dropping the packet.";
   }
 }
 
 void TransportChannelSocketAdapter::OnWritableState(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   // Try to send the packet if there is a pending write.
-  if (old_write_callback_ || !write_callback_.is_null()) {
+  if (write_callback_) {
     int result = channel_->SendPacket(write_buffer_->data(),
                                       write_buffer_size_);
     if (result < 0)
       result = net::MapSystemError(channel_->GetError());
 
     if (result != net::ERR_IO_PENDING) {
-      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 TransportChannelSocketAdapter::OnChannelDestroyed(
     cricket::TransportChannel* channel) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(channel, channel_);
   Close(net::ERR_CONNECTION_ABORTED);
 }
 
 }  // namespace jingle_glue