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

remoting/protocol/pepper_transport_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 "remoting/protocol/pepper_transport_socket_adapter.h"
 
 #include "base/logging.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 32 matching lines @@
 PepperTransportSocketAdapter::PepperTransportSocketAdapter(
     pp::Transport_Dev* transport,
     const std::string& name,
     Observer* observer)
     : name_(name),
       observer_(observer),
       transport_(transport),
       connected_(false),
       get_address_pending_(false),
       old_read_callback_(NULL),
-      old_write_callback_(NULL) {
+      write_callback_(NULL) {
   callback_factory_.Initialize(this);
 }
 
 PepperTransportSocketAdapter::~PepperTransportSocketAdapter() {
   observer_->OnChannelDeleted();
 }
 
 void PepperTransportSocketAdapter::AddRemoteCandidate(
     const std::string& candidate) {
   DCHECK(CalledOnValidThread());
@@ skipping 41 matching lines @@
     read_callback_ = callback;
     read_buffer_ = buf;
   }
 
   return result;
 }
 
 int PepperTransportSocketAdapter::Write(net::IOBuffer* buf, int buf_len,
                                         net::OldCompletionCallback* callback) {
   DCHECK(CalledOnValidThread());
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
+  DCHECK(!write_callback_);
   DCHECK(!write_buffer_);
 
   if (!transport_.get())
     return net::ERR_SOCKET_NOT_CONNECTED;
 
   int result = PPErrorToNetError(transport_->Send(
       buf->data(), buf_len,
       callback_factory_.NewOptionalCallback(
           &PepperTransportSocketAdapter::OnWrite)));
 
   if (result == net::ERR_IO_PENDING) {
-    old_write_callback_ = callback;
-    write_buffer_ = buf;
-  }
-
-  return result;
-}
-int PepperTransportSocketAdapter::Write(
-    net::IOBuffer* buf, int buf_len, const net::CompletionCallback& callback) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
-  DCHECK(!write_buffer_);
-
-  if (!transport_.get())
-    return net::ERR_SOCKET_NOT_CONNECTED;
-
-  int result = PPErrorToNetError(transport_->Send(
-      buf->data(), buf_len,
-      callback_factory_.NewOptionalCallback(
-          &PepperTransportSocketAdapter::OnWrite)));
-
-  if (result == net::ERR_IO_PENDING) {
     write_callback_ = callback;
     write_buffer_ = buf;
   }
 
   return result;
 }
 
 bool PepperTransportSocketAdapter::SetReceiveBufferSize(int32 size) {
   DCHECK(CalledOnValidThread());
   // TODO(sergeyu): Implement this: crbug.com/91439.
@@ skipping 192 matching lines @@
   } else {
     net::CompletionCallback callback = read_callback_;
     read_callback_.Reset();
     read_buffer_ = NULL;
     callback.Run(PPErrorToNetError(result));
   }
 }
 
 void PepperTransportSocketAdapter::OnWrite(int32_t result) {
   DCHECK(CalledOnValidThread());
-  DCHECK(old_write_callback_ || !write_callback_.is_null());
+  DCHECK(write_callback_);
   DCHECK(write_buffer_);
 
-  if (old_write_callback_) {
-    net::OldCompletionCallback* callback = old_write_callback_;
-    old_write_callback_ = NULL;
-    write_buffer_ = NULL;
-    callback->Run(PPErrorToNetError(result));
-  } else {
-    net::CompletionCallback callback = write_callback_;
-    write_callback_.Reset();
-    write_buffer_ = NULL;
-    callback.Run(PPErrorToNetError(result));
-  }
+  net::OldCompletionCallback* callback = write_callback_;
+  write_callback_ = NULL;
+  write_buffer_ = NULL;
+  callback->Run(PPErrorToNetError(result));
 }
 
 }  // namespace protocol
 }  // namespace remoting