Rewrite session cache in OpenSSL ports.

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 f19813ed05667bcf3a0d4037e46fd892767fbcd6..ceed942d35f563d084bbe75b2f5174e3a9d5f334 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -166,6 +166,14 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
                           const char *argp, int argi, long argl,
                           long retvalue);
 
+  // Called after the initial handshake completes and after the server
+  // certificate has been verified. Depending on whether the handshake False
+  // Started, the events may happen in either order. When both have, the session
+  // is cached.

[Ryan Sleevi, 2015/03/24 23:47:22]

It took me a while to parse this comment, as I thought you were referring to
InfoCallback

// Called after the the initial handshake has completed and after
// the server certificate has been verified.
// The order of handshake completion/cert verification is depends on
// whether or not the connection was false started. After both have
// happened (thus calling this twice), the session is safe to cache
// and will be cached.

Or something. I'm not quite sure, but it was "the events may happen in either
order" and the number of times this is called that confuse me.

[davidben, 2015/03/26 20:22:57]

Done.

+  void MaybeCacheSession();
+
+  void InfoCallback(int type, int val);

[Ryan Sleevi, 2015/03/24 23:47:22]

Document. How does this differ from say 164? May just need a comment like
162/163 (this is after every record received, right?)

[davidben, 2015/03/26 20:22:57]

They're basically totally unrelated. :-P
It's called when... Stuff Happens. It's not really clear and kind of called all
over the place. Sometime later I mean to look at all the users and see if I can
trim it down, since it even sees handshake state machine transitions with the
internal state.

Added a comment.

+
   // Adds the SignedCertificateTimestamps from ct_verify_result_ to |ssl_info|.
   // SCTs are held in three separate vectors in ct_verify_result, each
   // vetor representing a particular verification state, this method associates
@@ -264,9 +272,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // resume on the socket with a different value.
   const std::string ssl_session_cache_shard_;
 
-  // Used for session cache diagnostics.
-  bool trying_cached_session_;
-
   enum State {
     STATE_NONE,
     STATE_HANDSHAKE,
@@ -283,6 +288,10 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   std::string channel_id_cert_;
   // True if channel ID extension was negotiated.
   bool channel_id_xtn_negotiated_;
+  // True if the initial handshake has completed.
+  bool handshake_completed_;
+  // True if the initial handshake's certificate has been verified.
+  bool certificate_verified_;
   // The request handle for |channel_id_service_|.
   ChannelIDService::RequestHandle channel_id_request_handle_;