This CL changes the lifespan of SSLConnectJobMessengers so that they are created only when needed,

net/socket/ssl_client_socket_openssl.cc

 // Copyright (c) 2012 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.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <errno.h>
@@ skipping 356 matching lines @@
       handshake_succeeded_(false),
       marked_session_as_good_(false),
       transport_security_state_(context.transport_security_state),
       net_log_(transport_->socket()->NetLog()) {
 }
 
 SSLClientSocketOpenSSL::~SSLClientSocketOpenSSL() {
   Disconnect();
 }
 
+// Compute a unique key string for the SSL session cache.
+// Return a string.

[wtc, 2014/08/12 14:51:01]

I remember I asked you to revise this comment before. This shows this is very
likely a merge error.

[mshelley, 2014/08/12 21:47:01]

Done.

+std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
+  std::string result = host_and_port_.ToString();
+  result.append("/");
+  result.append(ssl_session_cache_shard_);
+  return result;
+}
+
 bool SSLClientSocketOpenSSL::InSessionCache() const {
   SSLContext* context = SSLContext::GetInstance();
   std::string cache_key = GetSessionCacheKey();
   return context->session_cache()->SSLSessionIsInCache(cache_key);
 }
 
 void SSLClientSocketOpenSSL::SetHandshakeCompletionCallback(
     const base::Closure& callback) {
   handshake_completion_callback_ = callback;
 }
@@ skipping 245 matching lines @@
                                  int buf_len,
                                  const CompletionCallback& callback) {
   user_read_buf_ = buf;
   user_read_buf_len_ = buf_len;
 
   int rv = DoReadLoop(OK);
 
   if (rv == ERR_IO_PENDING) {
     user_read_callback_ = callback;
   } else {
-    if (rv > 0)
+    if (rv > 0) {
       was_ever_used_ = true;
+    } else if (rv < 0) {
+      // Failure of a read attempt may indicate a failed false start
+      // connection.
+      OnHandshakeCompletion();
+    }

[Ryan Sleevi, 2014/08/12 00:27:42]

This should be / is a separate CL, right?

[wtc, 2014/08/12 14:51:00]

This is a merge error. The current code is on lines 660-664.

Please undo this change.

[mshelley, 2014/08/12 21:47:01]

Done.

     user_read_buf_ = NULL;
     user_read_buf_len_ = 0;
     if (rv <= 0) {
       // Failure of a read attempt may indicate a failed false start
       // connection.
       OnHandshakeCompletion();
     }
   }
 
   return rv;
 }
 
 int SSLClientSocketOpenSSL::Write(IOBuffer* buf,
                                   int buf_len,
                                   const CompletionCallback& callback) {
   user_write_buf_ = buf;
   user_write_buf_len_ = buf_len;
 
   int rv = DoWriteLoop(OK);
 
   if (rv == ERR_IO_PENDING) {
     user_write_callback_ = callback;
   } else {
-    if (rv > 0)
+    if (rv > 0) {
       was_ever_used_ = true;
+    } else {
+      // Failure of a write attempt may indicate a failed false start
+      // connection.
+      OnHandshakeCompletion();
+    }

[wtc, 2014/08/12 14:51:01]

Please undo this change.

[mshelley, 2014/08/12 21:47:01]

Done.

     user_write_buf_ = NULL;
     user_write_buf_len_ = 0;
     if (rv < 0) {
       // Failure of a write attempt may indicate a failed false start
       // connection.
       OnHandshakeCompletion();
     }
   }
 
   return rv;
@@ skipping 159 matching lines @@
   user_write_buf_ = NULL;
   user_write_buf_len_ = 0;
   if (rv < 0) {
     // Failure of a write attempt may indicate a failed false start
     // connection.
     OnHandshakeCompletion();
   }
   base::ResetAndReturn(&user_write_callback_).Run(rv);
 }
 
-std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
-  return CreateSessionCacheKey(host_and_port_, ssl_session_cache_shard_);
-}
-
 void SSLClientSocketOpenSSL::OnHandshakeCompletion() {
   if (!handshake_completion_callback_.is_null())
     base::ResetAndReturn(&handshake_completion_callback_).Run();
 }
 
 bool SSLClientSocketOpenSSL::DoTransportIO() {
   bool network_moved = false;
   int rv;
   // Read and write as much data as possible. The loop is necessary because
   // Write() may return synchronously.
@@ skipping 210 matching lines @@
     c.Run(rv > OK ? OK : rv);
   }
 }
 
 X509Certificate* SSLClientSocketOpenSSL::UpdateServerCert() {
   server_cert_chain_->Reset(SSL_get_peer_cert_chain(ssl_));
   server_cert_ = server_cert_chain_->AsOSChain();
 
   if (!server_cert_chain_->IsValid())
     DVLOG(1) << "UpdateServerCert received invalid certificate chain from peer";
-

[wtc, 2014/08/12 14:51:01]

This is probably a merge error. I seem to remember you added this blank line in
the main CL.

   return server_cert_.get();
 }
 
 void SSLClientSocketOpenSSL::OnHandshakeIOComplete(int result) {
   int rv = DoHandshakeLoop(result);
   if (rv != ERR_IO_PENDING) {
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
     DoConnectCallback(rv);
   }
 }
@@ skipping 542 matching lines @@
   if (handshake_succeeded_ && marked_session_as_good_)
     OnHandshakeCompletion();
 }
 
 scoped_refptr<X509Certificate>
 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const {
   return server_cert_;
 }
 
 }  // namespace net