This CL corrects a bug in which the OnHandshakeComplete callback for an ssl session was never called

net/socket/ssl_client_socket_openssl.h

 // 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 77 matching lines @@
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Socket implementation.
   virtual int Read(IOBuffer* buf, int buf_len,
                    const CompletionCallback& callback) OVERRIDE;
   virtual int Write(IOBuffer* buf, int buf_len,
                     const CompletionCallback& callback) OVERRIDE;
   virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual int SetSendBufferSize(int32 size) OVERRIDE;
 
+  void CheckIfSessionFinished();

[Ryan Sleevi, 2014/08/06 01:31:30]

This doesn't need to be public, does it? The static method can call this w/o it
needing to be.

[mshelley, 2014/08/06 03:09:31]

Done.

+
  protected:
   // SSLClientSocket implementation.
   virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
       const OVERRIDE;
 
  private:
   class PeerCertificateChain;
   class SSLContext;
   friend class SSLClientSocket;
   friend class SSLContext;
 
+  // Callback that is run by OpenSSL when a session's handshake has finished.
+  static void OnSessionFinishedCallback(const SSL* ssl, int result, int unused);
+
   int Init();
   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();
@@ skipping 142 matching lines @@
     STATE_VERIFY_CERT_COMPLETE,
   };
   State next_handshake_state_;
   NextProtoStatus npn_status_;
   std::string npn_proto_;
   // Written by the |channel_id_service_|.
   std::string channel_id_private_key_;
   std::string channel_id_cert_;
   // True if channel ID extension was negotiated.
   bool channel_id_xtn_negotiated_;
+  // Integer indicating the status of this connection's SSL handshake.
+  //
+  // |session_completion_count_| < 2 means that the ssl session associated with
+  // this socket has not been added to the session cache or has not been marked
+  // as good. |session_completion_count_| is incremented when a sesion is added
+  // to the session cache or marked as good, thus |session_completion_count_|
+  //  == 2 means that the session is ready for use.
+  int session_completion_count_;
   // The request handle for |channel_id_service_|.
   ChannelIDService::RequestHandle channel_id_request_handle_;
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_