Add QUIC 31 in which the server's proof covers both the static server config as well as a hash of t…

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 350 matching lines @@
   delete job;
 }
 
 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
   preconnect_job_set_.erase(job);
   delete job;
   OnPreconnectsCompleteInternal();
 }
 
 bool HttpStreamFactoryImpl::IsQuicWhitelistedForHost(const std::string& host) {
+  bool whitelist_needed = false;
+  for (QuicVersion version : session_->params().quic_supported_versions) {
+    if (version <= QUIC_VERSION_30) {
+      whitelist_needed = true;
+      break;
+    }
+  }
+
+  // The QUIC whitelist is not needed in QUIC versions after 30.
+  if (!whitelist_needed)
+    return true;
+
   if (session_->params().transport_security_state->IsGooglePinnedHost(host))
     return true;
 
   return ContainsKey(session_->params().quic_host_whitelist,
                      base::ToLowerASCII(host));
 }
 
 }  // namespace net