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

remoting/jingle_glue/ssl_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/jingle_glue/ssl_socket_adapter.h"
 
 #include "base/base64.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "jingle/glue/utils.h"
@@ skipping 170 matching lines @@
     if (0 != result) {
       // TODO(zork): Handle this case gracefully.
       LOG(WARNING) << "BeginSSL() failed with " << result;
     }
   }
 }
 
 TransportSocket::TransportSocket(talk_base::AsyncSocket* socket,
                                  SSLSocketAdapter *ssl_adapter)
     : old_read_callback_(NULL),
-      old_write_callback_(NULL),
+      write_callback_(NULL),
       read_buffer_len_(0),
       write_buffer_len_(0),
       socket_(socket),
       was_used_to_convey_data_(false) {
   socket_->SignalReadEvent.connect(this, &TransportSocket::OnReadEvent);
   socket_->SignalWriteEvent.connect(this, &TransportSocket::OnWriteEvent);
 }
 
 TransportSocket::~TransportSocket() {
 }
@@ skipping 118 matching lines @@
     }
   }
   if (result != net::ERR_IO_PENDING)
     was_used_to_convey_data_ = true;
   return result;
 }
 
 int TransportSocket::Write(net::IOBuffer* buf, int buf_len,
                            net::OldCompletionCallback* callback) {
   DCHECK(buf);
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
-  DCHECK(!write_buffer_.get());
-  int result = socket_->Send(buf->data(), buf_len);
-  if (result < 0) {
-    result = net::MapSystemError(socket_->GetError());
-    if (result == net::ERR_IO_PENDING) {
-      old_write_callback_ = callback;
-      write_buffer_ = buf;
-      write_buffer_len_ = buf_len;
-    }
-  }
-  if (result != net::ERR_IO_PENDING)
-    was_used_to_convey_data_ = true;
-  return result;
-}
-int TransportSocket::Write(net::IOBuffer* buf, int buf_len,
-                           const net::CompletionCallback& callback) {
-  DCHECK(buf);
-  DCHECK(!old_write_callback_ && write_callback_.is_null());
+  DCHECK(!write_callback_);
   DCHECK(!write_buffer_.get());
   int result = socket_->Send(buf->data(), buf_len);
   if (result < 0) {
     result = net::MapSystemError(socket_->GetError());
     if (result == net::ERR_IO_PENDING) {
       write_callback_ = callback;
       write_buffer_ = buf;
       write_buffer_len_ = buf_len;
     }
   }
@@ skipping 38 matching lines @@
     }
     was_used_to_convey_data_ = true;
     if (old_callback)
       old_callback->RunWithParams(Tuple1<int>(result));
     else
       callback.Run(result);
   }
 }
 
 void TransportSocket::OnWriteEvent(talk_base::AsyncSocket* socket) {
-  if (old_write_callback_ || !write_callback_.is_null()) {
+  if (write_callback_) {
     DCHECK(write_buffer_.get());
-    net::OldCompletionCallback* old_callback = old_write_callback_;
-    net::CompletionCallback callback = write_callback_;
+    net::OldCompletionCallback* callback = write_callback_;
     scoped_refptr<net::IOBuffer> buffer = write_buffer_;
     int buffer_len = write_buffer_len_;
 
-    old_write_callback_ = NULL;
-    write_callback_.Reset();
+    write_callback_ = NULL;
     write_buffer_ = NULL;
     write_buffer_len_ = 0;
 
     int result = socket_->Send(buffer->data(), buffer_len);
     if (result < 0) {
       result = net::MapSystemError(socket_->GetError());
       if (result == net::ERR_IO_PENDING) {
-        old_write_callback_ = old_callback;
         write_callback_ = callback;
         write_buffer_ = buffer;
         write_buffer_len_ = buffer_len;
         return;
       }
     }
     was_used_to_convey_data_ = true;
-    if (old_callback)
-      old_callback->RunWithParams(Tuple1<int>(result));
-    else
-      callback.Run(result);
+    callback->RunWithParams(Tuple1<int>(result));
   }
 }
 
 }  // namespace remoting