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

net/socket/ssl_client_socket_win.cc

Index: net/socket/ssl_client_socket_win.cc
===================================================================
--- net/socket/ssl_client_socket_win.cc	(revision 113718)
+++ net/socket/ssl_client_socket_win.cc	(working copy)
@@ -400,7 +400,7 @@
       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),
@@ -869,7 +869,7 @@
 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;
@@ -881,28 +881,6 @@
 
   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;
@@ -986,20 +964,12 @@
 
   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);
   }
 }