Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/socket_test_util.cc

Index: net/socket/socket_test_util.cc
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index f993801adeb2814aede788bcf82c693bfa99696f..af1b8e3b7ea6be013a7a62cb9911a5f43173798d 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ -277,7 +278,9 @@ SSLSocketDataProvider::SSLSocketDataProvider(IoMode mode, int result)
       client_cert_sent(false),
       cert_request_info(NULL),
       channel_id_sent(false),
-      connection_status(0) {
+      connection_status(0),
+      should_block_in_connect(false),
+      is_in_session_cache(false) {
   SSLConnectionStatusSetVersion(SSL_CONNECTION_VERSION_TLS1_2,
                                 &connection_status);
   // Set to TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
@@ -699,10 +702,13 @@ scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket(
     const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
     const SSLClientSocketContext& context) {
-  return scoped_ptr<SSLClientSocket>(
+  scoped_ptr<MockSSLClientSocket> socket(
       new MockSSLClientSocket(transport_socket.Pass(),
-                              host_and_port, ssl_config,
+                              host_and_port,
+                              ssl_config,
                               mock_ssl_data_.GetNext()));
+  ssl_client_sockets_.push_back(socket.get());
+  return socket.PassAs<SSLClientSocket>();
 }
 
 void MockClientSocketFactory::ClearSSLSessionCache() {
@@ -758,6 +764,18 @@ const BoundNetLog& MockClientSocket::NetLog() const {
   return net_log_;
 }
 
+bool MockClientSocket::InSessionCache() const {
+  return true;
+}
+
+void MockClientSocket::SetHandshakeSuccessCallback(const base::Closure& cb) {
+  NOTIMPLEMENTED();
+}
+
+void MockClientSocket::SetHandshakeFailureCallback(const base::Closure& cb) {
+  NOTIMPLEMENTED();
+}
+
 void MockClientSocket::GetSSLCertRequestInfo(
   SSLCertRequestInfo* cert_request_info) {
 }
@@ -781,6 +799,10 @@ ServerBoundCertService* MockClientSocket::GetServerBoundCertService() const {
   return NULL;
 }
 
+void MockSSLClientSocket::RestartPausedConnect() {
+  Connect(connect_callback_);
+}
+
 SSLClientSocket::NextProtoStatus
 MockClientSocket::GetNextProto(std::string* proto, std::string* server_protos) {
   proto->clear();
@@ -1314,15 +1336,16 @@ MockSSLClientSocket::MockSSLClientSocket(
     const SSLConfig& ssl_config,
     SSLSocketDataProvider* data)
     : MockClientSocket(
-         // Have to use the right BoundNetLog for LoadTimingInfo regression
-         // tests.
-         transport_socket->socket()->NetLog()),
+          // Have to use the right BoundNetLog for LoadTimingInfo regression
+          // tests.
+          transport_socket->socket()->NetLog()),
       transport_(transport_socket.Pass()),
       data_(data),
       is_npn_state_set_(false),
       new_npn_value_(false),
       is_protocol_negotiated_set_(false),
-      protocol_negotiated_(kProtoUnknown) {
+      protocol_negotiated_(kProtoUnknown),
+      next_connect_state_(STATE_CONNECT) {
   DCHECK(data_);
   peer_addr_ = data->connect.peer_addr;
 }
@@ -1341,18 +1364,61 @@ int MockSSLClientSocket::Write(IOBuffer* buf, int buf_len,
   return transport_->socket()->Write(buf, buf_len, callback);
 }
 
-int MockSSLClientSocket::Connect(const CompletionCallback& callback) {
+int MockSSLClientSocket::DoConnect(const CompletionCallback& callback) {
   int rv = transport_->socket()->Connect(
       base::Bind(&ConnectCallback, base::Unretained(this), callback));
-  if (rv == OK) {
+  next_connect_state_ = STATE_CONNECT_COMPLETE;
+
+  if (rv != OK)
+    return rv;
+
+  if (data_->should_block_in_connect) {
+    connect_callback_ = callback;
+    data_->should_block_in_connect = false;
     if (data_->connect.result == OK)
       connected_ = true;
+    return ERR_IO_PENDING;
+  } else {
+    return OK;
+  }
+}
+
+int MockSSLClientSocket::DoConnectComplete(const CompletionCallback& callback) {
+  if (data_->connect.result == OK) {
+    connected_ = true;
+    if (!success_callback_.is_null()) {
+      // The presence of |success_callback_| indicates that SSL Connect Job
+      // Waiting is enabled.
+      base::ResetAndReturn(&success_callback_).Run();
+    }
     if (data_->connect.mode == ASYNC) {
       RunCallbackAsync(callback, data_->connect.result);
       return ERR_IO_PENDING;
     }
-    return data_->connect.result;
+  } else if (!error_callback_.is_null()) {
+    base::ResetAndReturn(&error_callback_).Run();
   }
+  return data_->connect.result;
+}
+
+int MockSSLClientSocket::Connect(const CompletionCallback& callback) {
+  int rv;
+  do {
+    ConnectState state = next_connect_state_;
+    next_connect_state_ = STATE_NONE;
+    switch (state) {
+      case STATE_CONNECT:
+        rv = DoConnect(callback);
+        break;
+      case STATE_CONNECT_COMPLETE:
+        rv = DoConnectComplete(callback);
+        break;
+      default:
+        NOTREACHED();
+        break;
+    }
+  } while (rv == OK && next_connect_state_ != STATE_NONE);
+
   return rv;
 }
 
@@ -1363,7 +1429,7 @@ void MockSSLClientSocket::Disconnect() {
 }
 
 bool MockSSLClientSocket::IsConnected() const {
-  return transport_->socket()->IsConnected();
+  return transport_->socket()->IsConnected() && connected_;
 }
 
 bool MockSSLClientSocket::WasEverUsed() const {
@@ -1399,6 +1465,18 @@ void MockSSLClientSocket::GetSSLCertRequestInfo(
   }
 }
 
+bool MockSSLClientSocket::InSessionCache() const {
+  return data_->is_in_session_cache;
+}
+
+void MockSSLClientSocket::SetHandshakeSuccessCallback(const base::Closure& cb) {
+  success_callback_ = cb;
+}
+
+void MockSSLClientSocket::SetHandshakeFailureCallback(const base::Closure& cb) {
+  error_callback_ = cb;
+}
+
 SSLClientSocket::NextProtoStatus MockSSLClientSocket::GetNextProto(
     std::string* proto, std::string* server_protos) {
   *proto = data_->next_proto;