QUIC - Start the process for reading crypto config data from disk cache

net/quic/quic_stream_factory.cc

 // 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.
 
 #include "net/quic/quic_stream_factory.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 309 matching lines @@
     return OK;
   }
 
   if (HasActiveJob(host_port_proxy_pair)) {
     Job* job = active_jobs_[host_port_proxy_pair];
     active_requests_[request] = job;
     job_requests_map_[job].insert(request);
     return ERR_IO_PENDING;
   }
 
+  if (quic_server_info_factory_) {
+    // Start the async lookup of crypto config data from the disk cache.
+    quic_server_info_.reset(quic_server_info_factory_->GetForHost(
+        host_port_proxy_pair.first.host()));
+    quic_server_info_->Start();

[wtc, 2014/01/30 20:14:26]

It is wrong to set quic_server_info_ here, because it will be overwritten the
next time QuicStreamFactory::Create is called.

We need to call quic_server_info_factory_->GetForHost elsewhere. Alternatively,
we need to call GetOrCreateCryptoConfig here so that we can pass the new
QuicServerInfo to the QuicCryptoClientConfig constructor.

[ramant (doing other things), 2014/02/02 19:35:10]

Modified the code to create the crypto config and start the async read of crypto
config from disk.
Done.

+  }
+
   scoped_ptr<Job> job(new Job(this, host_resolver_, host_port_proxy_pair,
                               is_https, cert_verifier, net_log));
   int rv = job->Run(base::Bind(&QuicStreamFactory::OnJobComplete,
                                base::Unretained(this), job.get()));
 
   if (rv == ERR_IO_PENDING) {
     active_requests_[request] = job.get();
     job_requests_map_[job.get()].insert(request);
     active_jobs_[host_port_proxy_pair] = job.release();
   }
@@ skipping 259 matching lines @@
 QuicCryptoClientConfig* QuicStreamFactory::GetOrCreateCryptoConfig(
     const HostPortProxyPair& host_port_proxy_pair) {
   QuicCryptoClientConfig* crypto_config;
 
   if (ContainsKey(all_crypto_configs_, host_port_proxy_pair)) {
     crypto_config = all_crypto_configs_[host_port_proxy_pair];
     DCHECK(crypto_config);
   } else {
     // TODO(rtenneti): if two quic_sessions for the same host_port_proxy_pair
     // share the same crypto_config, will it cause issues?
-    crypto_config = new QuicCryptoClientConfig(quic_server_info_factory_);
+    crypto_config = new QuicCryptoClientConfig(quic_server_info_.Pass());
     crypto_config->SetDefaults();
     all_crypto_configs_[host_port_proxy_pair] = crypto_config;
     PopulateFromCanonicalConfig(host_port_proxy_pair, crypto_config);
   }
   return crypto_config;
 }
 
 void QuicStreamFactory::PopulateFromCanonicalConfig(
     const HostPortProxyPair& host_port_proxy_pair,
     QuicCryptoClientConfig* crypto_config) {
@@ skipping 27 matching lines @@
   // Copy the CachedState for the canonical server from canonical_crypto_config
   // as the initial CachedState for the server_hostname in crypto_config.
   crypto_config->InitializeFrom(server_hostname,
                                 canonical_host_port_proxy_pair.first.host(),
                                 canonical_crypto_config);
   // Update canonical version to point at the "most recent" crypto_config.
   canonical_hostname_to_origin_map_[canonical_host_port] = host_port_proxy_pair;
 }
 
 }  // namespace net