Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_client_socket_openssl.h

Index: net/socket/ssl_client_socket_openssl.h
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index 5d70c0523fabe0230b2361f7418688f1215fe0df..2c035722457151f36e6c5857f1a5793ffc3a8c89 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -57,6 +57,9 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   }
 
   // SSLClientSocket implementation.
+  virtual bool InSessionCache() const OVERRIDE;
+  virtual void SetHandshakeCompletionCallback(
+      const base::Closure& callback) OVERRIDE;
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual NextProtoStatus GetNextProto(std::string* proto,
@@ -108,6 +111,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
 
+  // Compute a unique key string for the SSL session cache.
+  std::string GetSessionCacheKey() const;
+  void OnHandshakeCompletion();
+
   bool DoTransportIO();
   int DoHandshake();
   int DoVerifyCert(int result);
@@ -208,6 +215,9 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // The service for retrieving Channel ID keys.  May be NULL.
   ServerBoundCertService* server_bound_cert_service_;
 
+  // Callback that is invoked when the connection finishes.
+  base::Closure completion_callback_;

[wtc, 2014/07/23 22:53:33]

Name this field "handshake_completion_callback_".

[mshelley, 2014/07/24 20:37:48]

Done.

+
   // OpenSSL stuff
   SSL* ssl_;
   BIO* transport_bio_;