Makes waiting SSLConnectJobs use the message loops to resume their connection.

net/socket/ssl_client_socket_pool.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_POOL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 98 matching lines @@
     SSLClientSocket* socket;
     base::Closure callback;
 
     SocketAndCallback(SSLClientSocket* ssl_socket,
                       base::Closure job_resumption_callback)
         : socket(ssl_socket), callback(job_resumption_callback) {}
   };
 
   typedef std::vector<SocketAndCallback> SSLPendingSocketsAndCallbacks;
 
+  SSLConnectJobMessenger();
+
   // Returns true if the given |ssl_socket| should continue its
   // SSL connection.

[Ryan Sleevi, 2014/07/10 20:30:45]

unrelated to this CL: (not sure which CL is the master for this, or if this has
landed, with all the CLs flying about)

// Returns true if |ssl_socket|'s Connect() method should be called.

[mshelley, 2014/07/10 22:49:59]

Done.

   bool CanProceed(SSLClientSocket* ssl_socket);
 
   // Informs the session cache that it should notify the SSLConnectJobMessenger
   // upon the completion of |ssl_socket|'s connection.

[Ryan Sleevi, 2014/07/10 20:30:45]

unrelated to this CL:

// Configure the SSLConnectJobMessenger to begin monitoring |ssl_socket|'s
// connection status. After a successful connection, or an error,
// the messenger will determine which sockets that have been added
// via AddPendingSocket() to allow to proceed, notifying the associated
// callback asynchronously, so that the caller can call Connect() on them.

[mshelley, 2014/07/10 22:49:59]

Done.

   void MonitorConnectionResult(SSLClientSocket* ssl_socket);
 
   // Adds the socket and its associated callback to the SSLConnectJobMessenger's
   // list of pending sockets and callbacks.
   void AddPendingSocket(SSLClientSocket* socket, const base::Closure& callback);

[Ryan Sleevi, 2014/07/10 20:30:45]

// Adds |socket| to the list of sockets waiting to Connect(). When
// the messenger has determined it's an appropriate time for |socket|
// to connect, it will asynchronously invoke |callback|. Callers should
// then proceed to call Connect() and establish the socket.
//
// Note: It is an error to call AddPendingSocket() without having first
// called MonitorConnectionResult() and configuring a socket that WILL
// have Connect() called on it.

[mshelley, 2014/07/10 22:49:59]

Done.

 
   // Processes pending callbacks when a socket successfully completes
   // its connection.
   void OnJobSucceeded();
 
-  // Processes pending callbacks when a socket encounters an error
+  // Posts a task to process pending callbacks when a socket encounters an error
   // while completing its connection.
   void OnJobFailed();

[Ryan Sleevi, 2014/07/10 20:30:45]

note: OnJobSucceeded and OnJobFailed both seem to only be used in base::Bind()
calls.

In that case, these methods should be private.

The same seems to be true for ConnectNewLeader (which is called by OnJobFailed)

[mshelley, 2014/07/10 22:49:59]

OnJobFailed is called once directly in DoSSLConenctComplete, but I'll make the
others private.

 
+  // Determines which pending socket should be the next leading connection,
+  // and runs that socket's resumption callback.
+  void ConnectNewLeader();
+
  private:
   // Runs all callbacks stored in |pending_sockets_and_callbacks_|.
-  void RunAllJobs(std::vector<SocketAndCallback>& pending_socket_and_callbacks);
+  void RunAllJobs(
+      std::vector<SocketAndCallback>& pending_sockets_and_callbacks);
 
+  base::WeakPtrFactory<SSLConnectJobMessenger> weak_factory_;
   SSLPendingSocketsAndCallbacks pending_sockets_and_callbacks_;
   std::vector<SSLClientSocket*> connecting_sockets_;
 };
 
 // SSLConnectJob handles the SSL handshake after setting up the underlying
 // connection as specified in the params.
 class SSLConnectJob : public ConnectJob {
  public:
   // Note: the SSLConnectJob does not own |messenger|.
   // so it must outlive the job.
@@ skipping 214 matching lines @@
   HttpProxyClientSocketPool* const http_proxy_pool_;
   PoolBase base_;
   const scoped_refptr<SSLConfigService> ssl_config_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_