Update from https://crrev.com/309415

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/cpu.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 527 matching lines @@
     QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
     QuicRandom* random_generator,
     QuicClock* clock,
     size_t max_packet_length,
     const std::string& user_agent_id,
     const QuicVersionVector& supported_versions,
     bool enable_port_selection,
     bool always_require_handshake_confirmation,
     bool disable_connection_pooling,
     int load_server_info_timeout,
+    bool disable_loading_server_info_for_new_servers,
     const QuicTagVector& connection_options)
     : require_confirmation_(true),
       host_resolver_(host_resolver),
       client_socket_factory_(client_socket_factory),
       http_server_properties_(http_server_properties),
       transport_security_state_(transport_security_state),
       quic_server_info_factory_(nullptr),
       quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
       random_generator_(random_generator),
       clock_(clock),
       max_packet_length_(max_packet_length),
       config_(InitializeQuicConfig(connection_options)),
       supported_versions_(supported_versions),
       enable_port_selection_(enable_port_selection),
       always_require_handshake_confirmation_(
           always_require_handshake_confirmation),
       disable_connection_pooling_(disable_connection_pooling),
       load_server_info_timeout_ms_(load_server_info_timeout),
+      disable_loading_server_info_for_new_servers_(
+          disable_loading_server_info_for_new_servers),
       port_seed_(random_generator_->RandUint64()),
       check_persisted_supports_quic_(true),
       task_runner_(nullptr),
       weak_factory_(this) {
   DCHECK(transport_security_state_);
   crypto_config_.set_user_agent_id(user_agent_id);
   crypto_config_.AddCanonicalSuffix(".c.youtube.com");
   crypto_config_.AddCanonicalSuffix(".googlevideo.com");
   crypto_config_.SetProofVerifier(
       new ProofVerifierChromium(cert_verifier, transport_security_state));
@@ skipping 40 matching lines @@
 
   if (HasActiveJob(server_id)) {
     Job* job = active_jobs_[server_id];
     active_requests_[request] = job;
     job_requests_map_[job].insert(request);
     return ERR_IO_PENDING;
   }
 
   QuicServerInfo* quic_server_info = nullptr;
   if (quic_server_info_factory_) {
-    QuicCryptoClientConfig::CachedState* cached =
-        crypto_config_.LookupOrCreate(server_id);
-    DCHECK(cached);
-    if (cached->IsEmpty()) {
-      quic_server_info = quic_server_info_factory_->GetForServer(server_id);
+    bool load_from_disk_cache = true;
+    if (disable_loading_server_info_for_new_servers_) {
+      const AlternateProtocolMap& alternate_protocol_map =
+          http_server_properties_->alternate_protocol_map();
+      AlternateProtocolMap::const_iterator it =
+          alternate_protocol_map.Peek(server_id.host_port_pair());
+      if (it == alternate_protocol_map.end() || it->second.protocol != QUIC) {
+        // If there is no entry for QUIC, consider that as a new server and
+        // don't wait for Cache thread to load the data for that server.
+        load_from_disk_cache = false;
+      }
+    }
+    if (load_from_disk_cache) {
+      QuicCryptoClientConfig::CachedState* cached =
+          crypto_config_.LookupOrCreate(server_id);
+      DCHECK(cached);
+      if (cached->IsEmpty()) {
+        quic_server_info = quic_server_info_factory_->GetForServer(server_id);
+      }
     }
   }
   // TODO(rtenneti): Initialize task_runner_ in the constructor after
   // WebRequestActionWithThreadsTest.* tests are fixed.
   if (!task_runner_)
     task_runner_ = base::MessageLoop::current()->message_loop_proxy().get();
 
   bool was_alternate_protocol_recently_broken =
       http_server_properties_ &&
       http_server_properties_->WasAlternateProtocolRecentlyBroken(
@@ skipping 494 matching lines @@
   http_server_properties_->ClearAlternateProtocol(server);
   http_server_properties_->SetAlternateProtocol(
       server, alternate.port, alternate.protocol, 1);
   DCHECK_EQ(QUIC,
             http_server_properties_->GetAlternateProtocol(server).protocol);
   DCHECK(http_server_properties_->WasAlternateProtocolRecentlyBroken(
       server));
 }
 
 }  // namespace net