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

net/socket/ssl_client_socket_win.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 "net/socket/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 382 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(
         read_callback_(this, &SSLClientSocketWin::OnReadComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
         write_callback_(this, &SSLClientSocketWin::OnWriteComplete)),
       transport_(transport_socket),
       host_and_port_(host_and_port),
       ssl_config_(ssl_config),
       old_user_connect_callback_(NULL),
       old_user_read_callback_(NULL),
       user_read_buf_len_(0),
-      old_user_write_callback_(NULL),
+      user_write_callback_(NULL),
       user_write_buf_len_(0),
       next_state_(STATE_NONE),
       cert_verifier_(context.cert_verifier),
       creds_(NULL),
       isc_status_(SEC_E_OK),
       payload_send_buffer_len_(0),
       bytes_sent_(0),
       decrypted_ptr_(NULL),
       bytes_decrypted_(0),
       received_ptr_(NULL),
@@ skipping 448 matching lines @@
   } else {
     user_read_buf_ = NULL;
     user_read_buf_len_ = 0;
   }
   return rv;
 }
 
 int SSLClientSocketWin::Write(IOBuffer* buf, int buf_len,
                               OldCompletionCallback* callback) {
   DCHECK(completed_handshake());
-  DCHECK(!old_user_write_callback_ && user_write_callback_.is_null());
+  DCHECK(!user_write_callback_);
 
   DCHECK(!user_write_buf_);
   user_write_buf_ = buf;
   user_write_buf_len_ = buf_len;
 
   int rv = DoPayloadEncrypt();
   if (rv != OK)
     return rv;
 
   rv = DoPayloadWrite();
   if (rv == ERR_IO_PENDING) {
-    old_user_write_callback_ = callback;
-  } else {
-    user_write_buf_ = NULL;
-    user_write_buf_len_ = 0;
-  }
-  return rv;
-}
-int SSLClientSocketWin::Write(IOBuffer* buf, int buf_len,
-                              const CompletionCallback& callback) {
-  DCHECK(completed_handshake());
-  DCHECK(!old_user_write_callback_ && user_write_callback_.is_null());
-
-  DCHECK(!user_write_buf_);
-  user_write_buf_ = buf;
-  user_write_buf_len_ = buf_len;
-
-  int rv = DoPayloadEncrypt();
-  if (rv != OK)
-    return rv;
-
-  rv = DoPayloadWrite();
-  if (rv == ERR_IO_PENDING) {
     user_write_callback_ = callback;
   } else {
     user_write_buf_ = NULL;
     user_write_buf_len_ = 0;
   }
   return rv;
 }
 
 bool SSLClientSocketWin::SetReceiveBufferSize(int32 size) {
   return transport_->socket()->SetReceiveBufferSize(size);
@@ skipping 63 matching lines @@
       c.Run(result);
     }
   }
 }
 
 void SSLClientSocketWin::OnWriteComplete(int result) {
   DCHECK(completed_handshake());
 
   int rv = DoPayloadWriteComplete(result);
   if (rv != ERR_IO_PENDING) {
-    DCHECK(old_user_write_callback_ || !user_write_callback_.is_null());
-    if (old_user_write_callback_) {
-      OldCompletionCallback* c = old_user_write_callback_;
-      old_user_write_callback_ = NULL;
-      user_write_buf_ = NULL;
-      user_write_buf_len_ = 0;
-      c->Run(rv);
-    } else {
-      CompletionCallback c = user_write_callback_;
-      user_write_callback_.Reset();
-      user_write_buf_ = NULL;
-      user_write_buf_len_ = 0;
-      c.Run(rv);
-    }
+    DCHECK(user_write_callback_);
+    OldCompletionCallback* c = user_write_callback_;
+    user_write_callback_ = NULL;
+    user_write_buf_ = NULL;
+    user_write_buf_len_ = 0;
+    c->Run(rv);
   }
 }
 
 
 int SSLClientSocketWin::DoLoop(int last_io_result) {
   DCHECK(next_state_ != STATE_NONE);
   int rv = last_io_result;
   do {
     State state = next_state_;
     next_state_ = STATE_NONE;
@@ skipping 672 matching lines @@
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
 }
 
 void SSLClientSocketWin::FreeSendBuffer() {
   SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
   DCHECK(status == SEC_E_OK);
   memset(&send_buffer_, 0, sizeof(send_buffer_));
 }
 
 }  // namespace net