This CL is a follow up to https://codereview.chromium.org/416683002/.

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 3d2194b304af4094cd88e483d70159a72940085a..eab46beb8977033ecec0e6ed6af82b0aa03c9afe 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -106,10 +106,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   friend class SSLClientSocket;
   friend class SSLContext;
 
-  // Callback that is run by OpenSSL to obtain information about the
-  // state of the SSL handshake.
-  static void InfoCallback(const SSL* ssl, int result, int unused);
-
   int Init();
   void DoReadCallback(int result);
   void DoWriteCallback(int result);
@@ -172,6 +168,10 @@ 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*/);

[wtc, 2014/08/07 23:25:31]

Nit: The Style Guide only recommends commenting out unused function parameters
in the definition. So in the declaration we don't need to comment out 'val'.

Here is an excerpt of the Style Guide:

If some parameters are unused, comment out the variable name in the function
definition:

// Always have named parameters in interfaces.
class Shape {
 public:
  virtual void Rotate(double radians) = 0;
}

// Always have named parameters in the declaration.
class Circle : public Shape {
 public:
  virtual void Rotate(double radians);
}

// Comment out unused named parameters in definitions.
void Circle::Rotate(double /*radians*/) {}

+
   void CheckIfHandshakeFinished();
 
   bool transport_send_busy_;
@@ -211,11 +211,11 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // error writing to the transport socket. A value of OK indicates no error.
   int transport_write_error_;
 
-  // Set when handshake finishes.
+  // Set when Connect finishes.
   scoped_ptr<PeerCertificateChain> server_cert_chain_;
   scoped_refptr<X509Certificate> server_cert_;
   CertVerifyResult server_cert_verify_result_;
-  bool completed_handshake_;
+  bool completed_connect_;
 
   // Set when Read() or Write() successfully reads or writes data to or from the
   // network.
@@ -275,9 +275,9 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   // 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 ran_handshake_finished_callback_;
+  bool handshake_succeeded_;
   // True if MarkSSLSessionAsGood has been called for this socket's
-  // connection's SSL session.
+  // SSL session.
   bool marked_session_as_good_;
   // The request handle for |channel_id_service_|.
   ChannelIDService::RequestHandle channel_id_request_handle_;