Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_client_socket.h

Index: net/socket/ssl_client_socket.h
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h
index a43e58cc26b852fb86d92a1a5ac7c4e7c357b286..091faa608337eb6d388f0fa0101195cc244ea464 100644
--- a/net/socket/ssl_client_socket.h
+++ b/net/socket/ssl_client_socket.h
@@ -81,6 +81,17 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
 
+  // Returns true if there is a cache entry in the ssl session cache
+  // for the given cache key.
+  //
+  // The cache key consists of a host_and_poart concatenated with a session

[wtc, 2014/06/27 00:36:49]

Typo: poart => port

[mshelley, 2014/07/01 02:35:22]

Done.

+  // cache shard.
+  virtual bool InSessionCache() const = 0;
+
+  virtual void OnSessionComplete(const base::Closure& c) const = 0;
+
+  virtual void OnSocketFailure(const base::Closure& cb) = 0;

[wtc, 2014/06/27 00:36:49]

1. Document these two methods.

2. Don't abbreviate the parameter names. They should be named 'callback' or
'closure'.

[mshelley, 2014/07/01 02:35:22]

Done.

+
   // Gets the SSL CertificateRequest info of the socket after Connect failed
   // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
   virtual void GetSSLCertRequestInfo(
@@ -185,6 +196,9 @@ class NET_EXPORT SSLClientSocket : public SSLSocket {
   bool signed_cert_timestamps_received_;
   // True if a stapled OCSP response was received.
   bool stapled_ocsp_response_received_;
+
+  // Callback that is invoked when the connection encounters an error.
+  base::Closure error_callback_;

[wtc, 2014/06/27 00:36:49]

Delete this? SSLClientSocketOpenSSL has a same-named member.

[mshelley, 2014/07/01 02:35:22]

Done.

 };
 
 }  // namespace net