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..7089aa6d921869c29eb016250075c47edc663719 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -394,6 +394,7 @@ SystemRequestContextLeakChecker::~SystemRequestContextLeakChecker() {
 
 IOThread::Globals::Globals()
     : system_request_context_leak_checker(this),
+      enable_ssl_connect_job_waiting(false),
       ignore_certificate_errors(false),
       testing_fixed_http_port(0),
       testing_fixed_https_port(0),
@@ -632,6 +633,8 @@ void IOThread::InitAsync() {
         command_line.GetSwitchValueASCII(switches::kHostRules));
     TRACE_EVENT_END0("startup", "IOThread::InitAsync:SetRulesFromString");
   }
+  if (command_line.HasSwitch(switches::kEnableSSLConnectJobWaiting))
+    globals_->enable_ssl_connect_job_waiting = true;
   if (command_line.HasSwitch(switches::kIgnoreCertificateErrors))
     globals_->ignore_certificate_errors = true;
   if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
@@ -942,6 +945,8 @@ void IOThread::InitializeNetworkSessionParams(
       globals_->http_server_properties->GetWeakPtr();
   params->network_delegate = globals_->system_network_delegate.get();
   params->host_mapping_rules = globals_->host_mapping_rules.get();
+  params->enable_ssl_connect_job_waiting =
+      globals_->enable_ssl_connect_job_waiting;
   params->ignore_certificate_errors = globals_->ignore_certificate_errors;
   params->testing_fixed_http_port = globals_->testing_fixed_http_port;
   params->testing_fixed_https_port = globals_->testing_fixed_https_port;