Implements new, more robust design for communicating between SSLConnectJobs.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 621ab62f84514d9ead273a88758a75eb8b3178b0..179043e425d3d9e6b53f3ea766015c4eb24dd3db 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -397,7 +397,8 @@ IOThread::Globals::Globals()
       ignore_certificate_errors(false),
       testing_fixed_http_port(0),
       testing_fixed_https_port(0),
-      enable_user_alternate_protocol_ports(false) {
+      enable_user_alternate_protocol_ports(false),
+      enable_ssl_connect_job_waiting(false) {
 }
 
 IOThread::Globals::~Globals() {}
@@ -647,6 +648,9 @@ void IOThread::InitAsync() {
           switches::kEnableUserAlternateProtocolPorts)) {
     globals_->enable_user_alternate_protocol_ports = true;
   }
+  if (command_line.HasSwitch(switches::kEnableSSLConnectJobWaiting)) {
+    globals_->enable_ssl_connect_job_waiting = true;
+  }

[wtc, 2014/07/23 22:53:32]

1. Omit curly braces.

2. Nit: move this before line 636, if you reordered the fields.

[mshelley, 2014/07/24 20:37:46]

Done.

   InitializeNetworkOptions(command_line);
 
   net::HttpNetworkSession::Params session_params;
@@ -984,6 +988,8 @@ void IOThread::InitializeNetworkSessionParams(
       &params->origin_to_force_quic_on);
   params->enable_user_alternate_protocol_ports =
       globals_->enable_user_alternate_protocol_ports;
+  params->enable_ssl_connect_job_waiting =
+      globals_->enable_ssl_connect_job_waiting;

[wtc, 2014/07/23 22:53:32]

Nit: move this before line 949, if you reordered the fields.

[mshelley, 2014/07/24 20:37:46]

Done.

 }
 
 base::TimeTicks IOThread::creation_time() const {