Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_session_cache_openssl.h

Index: net/socket/ssl_session_cache_openssl.h
diff --git a/net/socket/ssl_session_cache_openssl.h b/net/socket/ssl_session_cache_openssl.h
index bbd9659641df062dc870880f805031006deddb59..83d5a1062ee5101f726860bdc330f0958c0f38d9 100644
--- a/net/socket/ssl_session_cache_openssl.h
+++ b/net/socket/ssl_session_cache_openssl.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/callback.h"

[wtc, 2014/07/11 00:48:56]

Include "base/callback_forward.h" instead because we just need a forward
declaration of base::Closure.

[mshelley, 2014/07/11 23:26:28]

Done.

 #include "net/base/net_export.h"
 
 // Avoid including OpenSSL headers here.
@@ -113,6 +114,16 @@ class NET_EXPORT SSLSessionCacheOpenSSL {
   // Return true iff a cached session was associated with the |ssl| connection.
   bool SetSSLSessionWithKey(SSL* ssl, const std::string& cache_key);
 
+  // Return true iff a cached session was associated with the given |cache_key|.
+  bool SSLSessionIsInCache(const std::string& cache_key) const;
+
+  // Removes the entry for |ssl| from cache's callback map.
+  void RemoveFromSSLToCallbackMap(SSL* ssl);

[wtc, 2014/07/11 00:48:56]

1. RemoveFromSSLToCallbackMap => RemoveSessionAddedCallback

No need to reveal the implementation detail that the callbacks are stored in a
map.

2. Nit: List this method after RegisterSessionAddedCallback to match the order
in which they are called.

[mshelley, 2014/07/11 23:26:28]

Done.

+
+  // Informs the cache that it should run a callback when |ssl|'s
+  // session is added to the cache.
+  void RegisterSessionAddedCallback(SSL* ssl, const base::Closure& callback);

[wtc, 2014/07/11 00:48:56]

This class and ssl_client_socket.h should use either "Register" or "Set"
consistently for functions that set callbacks.

[mshelley, 2014/07/11 23:26:28]

Done.

+
   // Indicates that the SSL session associated with |ssl| is "good" - that is,
   // that all associated cryptographic parameters that were negotiated,
   // including the peer's certificate, were successfully validated. Because