Unwind the SSL connection holdback experiment and remove related code

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 6aaf1e16672d65dc753da56ded07c2e90f546a34..e85a46da0ed57e7fb0a55b94ab5ef504a539afd1 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -60,9 +60,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   }
 
   // SSLClientSocket implementation.
-  std::string GetSessionCacheKey() const override;
-  bool InSessionCache() const override;
-  void SetHandshakeCompletionCallback(const base::Closure& callback) override;
   void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info) override;
   NextProtoStatus GetNextProto(std::string* proto) override;
   ChannelIDService* GetChannelIDService() const override;
@@ -114,8 +111,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
 
-  void OnHandshakeCompletion();
-
   bool DoTransportIO();
   int DoHandshake();
   int DoChannelIDLookup();
@@ -171,12 +166,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
                           const char *argp, int argi, long argl,
                           long retvalue);
 
-  // Callback that is used to obtain information about the state of the SSL
-  // handshake.
-  static void InfoCallback(const SSL* ssl, int type, int val);
-
-  void CheckIfHandshakeFinished();
-
   // 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
@@ -228,11 +217,11 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // error writing to the transport socket. A value of OK indicates no error.
   int transport_write_error_;
 
-  // Set when Connect finishes.
+  // Set when handshake finishes.
   scoped_ptr<PeerCertificateChain> server_cert_chain_;
   scoped_refptr<X509Certificate> server_cert_;
   CertVerifyResult server_cert_verify_result_;
-  bool completed_connect_;
+  bool completed_handshake_;

[davidben, 2015/03/09 18:02:36]

I think the LHS naming is actually more accurate in the face of False Start.
(Maybe even be worth an explanatory comment. Or we can leave that for another
CL.)

 
   // Set when Read() or Write() successfully reads or writes data to or from the
   // network.
@@ -259,12 +248,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // The service for retrieving Channel ID keys.  May be NULL.
   ChannelIDService* channel_id_service_;
 
-  // Callback that is invoked when the connection finishes.
-  //
-  // Note: this callback will be run in Disconnect(). It will not alter
-  // any member variables of the SSLClientSocketOpenSSL.
-  base::Closure handshake_completion_callback_;
-
   // OpenSSL stuff
   SSL* ssl_;
   BIO* transport_bio_;
@@ -296,11 +279,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   std::string channel_id_cert_;
   // True if channel ID extension was negotiated.
   bool channel_id_xtn_negotiated_;
-  // True if InfoCallback has been run with result = SSL_CB_HANDSHAKE_DONE.
-  bool handshake_succeeded_;
-  // True if MarkSSLSessionAsGood has been called for this socket's
-  // SSL session.
-  bool marked_session_as_good_;

[davidben, 2015/03/09 18:02:36]

Fine to remove this now, but my session cache CL will probably bring some form
of it back. I think the verify + false start resolving should happen in
SSLClientSocketOpenSSL rather than in the session cache; the session cache will
just have an Insert method and it'll be the caller's responsibility to not
insert a session until both handshake and verification are done. Interface is
simpler that way.

(Also, I doubt we can actually change it in BoringSSL, but, in the False Start
case, I don't like SSL_get_session being called before the handshake is
completely finished. It gets into weirdnesses of, if there's a pending renego,
should SSL_get_session return the session we'd currently using or the session
for the current connection. With session tickets, you're even accessing the
SSL_SESSION before the ticket's filled in.)

   // The request handle for |channel_id_service_|.
   ChannelIDService::RequestHandle channel_id_request_handle_;