QUIC - Disable Preconnect when QUIC can be spoken to a server with 0RTT

net/http/http_stream_factory_impl.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/http/http_stream_factory_impl.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 115 matching lines @@
     const HttpRequestInfo& request_info,
     const SSLConfig& server_ssl_config,
     const SSLConfig& proxy_ssl_config) {
   DCHECK(!for_websockets_);
   AlternativeService alternative_service;
   AlternativeServiceVector alternative_service_vector =
       GetAlternativeServicesFor(request_info.url);
   if (!alternative_service_vector.empty()) {
     // TODO(bnc): Pass on multiple alternative services to Job.
     alternative_service = alternative_service_vector[0];
+    if (session_->params().disable_preconnects &&
+        alternative_service.protocol == QUIC &&
+        session_->quic_stream_factory()->IsQuicDoingZeroRTT(
+            alternative_service.host_port_pair(), request_info.privacy_mode)) {
+      return;
+    }
   }
 
   // Due to how the socket pools handle priorities and idle sockets, only IDLE
   // priority currently makes sense for preconnects. The priority for
   // preconnects is currently ignored (see RequestSocketsForPool()), but could
   // be used at some point for proxy resolution or something.
   Job* job =
       new Job(this, session_, request_info, IDLE, server_ssl_config,
               proxy_ssl_config, alternative_service, session_->net_log());
   preconnect_job_set_.insert(job);
@@ skipping 58 matching lines @@
       continue;
     }
 
     DCHECK_EQ(QUIC, alternative_service.protocol);
     if (!session_->params().enable_quic)
       continue;
 
     if (session_->quic_stream_factory()->IsQuicDisabled(origin.port()))
       continue;
 
-    if (!original_url.SchemeIs("https")) {
+    if (!original_url.SchemeIs("https"))
       continue;
-    }
 
     enabled_alternative_service_vector.push_back(alternative_service);
   }
   return enabled_alternative_service_vector;
 }
 
 void HttpStreamFactoryImpl::OrphanJob(Job* job, const Request* request) {
   DCHECK(ContainsKey(request_map_, job));
   DCHECK_EQ(request_map_[job], request);
   DCHECK(!ContainsKey(orphaned_job_set_, job));
@@ skipping 49 matching lines @@
   delete job;
 }
 
 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
   preconnect_job_set_.erase(job);
   delete job;
   OnPreconnectsCompleteInternal();
 }
 
 }  // namespace net