Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_client_socket.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_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 63 matching lines @@
     kNextProtoUnsupported = 0,  // The server doesn't support NPN.
     kNextProtoNegotiated = 1,   // We agreed on a protocol.
     kNextProtoNoOverlap = 2,    // No protocols in common. We requested
                                 // the first protocol in our list.
   };
 
   // StreamSocket:
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
 
+  // Returns true if there is a cache entry in the ssl session cache
+  // for the given cache key.
+  //
+  // The cache key consists of a host_and_port concatenated with a session

[mmenke, 2014/07/08 21:02:05]

I don't see any object named host_and_port.  I think you mean a HostPortPair? 
Or just "a host and port".

[mshelley, 2014/07/09 19:51:00]

Done.

+  // cache shard.
+  virtual bool InSessionCache() const = 0;
+
+  // Tells the session cache to monitor this socket's session and inform
+  // its SSLConnectJobMessenger upon the session's completion.

[wtc, 2014/07/08 01:25:42]

I don't understand what "session's completion" means.

[mshelley, 2014/07/09 19:51:00]

This refers to the completion of the connection for that session. I'll update
the comment to make that more clear.

+  virtual void WatchSessionForCompletion(
+      const base::Closure& callback) const = 0;
+
+  // Sets the callback to be used if the socket's connection should fail.
+  virtual void SetSocketFailureCallback(const base::Closure& callback) = 0;
+
+  // Sets the |is_leader_| variable to true.

[wtc, 2014/07/08 01:25:42]

This header doesn't have the "is_leader_" variable (or member?), so this method
needs to be documented without referring to "is_leader_".

[mshelley, 2014/07/09 19:51:00]

Done.

+  virtual void SetIsLeader() = 0;
+
+  // In the case of a failed connection, run the appropriate callback.
+  virtual void OnSocketFailure() = 0;
+
   // Gets the SSL CertificateRequest info of the socket after Connect failed
   // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) = 0;
 
   // Get the application level protocol that we negotiated with the server.
   // *proto is set to the resulting protocol (n.b. that the string may have
   // embedded NULs).
   //   kNextProtoUnsupported: *proto is cleared.
   //   kNextProtoNegotiated:  *proto is set to the negotiated protocol.
@@ skipping 32 matching lines @@
   virtual ServerBoundCertService* GetServerBoundCertService() const = 0;
 
   // Returns true if a channel ID was sent on this connection.
   // This may be useful for protocols, like SPDY, which allow the same
   // connection to be shared between multiple domains, each of which need
   // a channel ID.
   //
   // Public for ssl_client_socket_openssl_unittest.cc.
   virtual bool WasChannelIDSent() const;
 
+  // Enable SSLConnectJob waiting if |enable| is true.
+  static NET_EXPORT void EnableJobWaiting(bool enable);

[wtc, 2014/07/08 01:25:42]

EnableJobWaiting => EnableConnectJobWaiting.

GetEnableJobWaiting => GetEnableConnectJobWaiting

enable_job_waiting_ => enable_connect_job_waiting_

[mshelley, 2014/07/09 19:51:00]

Done.

+
+  static NET_EXPORT bool GetEnableJobWaiting();
+
  protected:
   virtual void set_channel_id_sent(bool channel_id_sent);
 
   virtual void set_signed_cert_timestamps_received(
       bool signed_cert_timestamps_received);
 
   virtual void set_stapled_ocsp_response_received(
       bool stapled_ocsp_response_received);
 
   // Records histograms for channel id support during full handshakes - resumed
@@ skipping 32 matching lines @@
   // True if NPN successfully negotiated SPDY.
   bool was_spdy_negotiated_;
   // Protocol that we negotiated with the server.
   NextProto protocol_negotiated_;
   // True if a channel ID was sent.
   bool channel_id_sent_;
   // True if SCTs were received via a TLS extension.
   bool signed_cert_timestamps_received_;
   // True if a stapled OCSP response was received.
   bool stapled_ocsp_response_received_;
+
+  static bool enable_job_waiting_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_