Make HSTS headers not clobber preloaded pins.

chrome/browser/net/predictor.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 "chrome/browser/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <sstream>
@@ skipping 1302 matching lines @@
   proxy_advisor_->Advise(url, motivation, is_preconnect);
 }
 
 GURL Predictor::GetHSTSRedirectOnIOThread(const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!transport_security_state_)
     return url;
   if (!url.SchemeIs("http"))
     return url;
-  net::TransportSecurityState::DomainState domain_state;
-  if (!transport_security_state_->GetDomainState(
-          url.host(),
-          net::SSLConfigService::IsSNIAvailable(ssl_config_service_),
-          &domain_state)) {
-    return url;
-  }
-  if (!domain_state.ShouldUpgradeToSSL())
+  bool sni_available =
+      net::SSLConfigService::IsSNIAvailable(ssl_config_service_);
+  if (!transport_security_state_->ShouldUpgradeToSSL(url.host(), sni_available))
     return url;
 
   url::Replacements<char> replacements;
   const char kNewScheme[] = "https";
   replacements.SetScheme(kNewScheme, url::Component(0, strlen(kNewScheme)));
   return url.ReplaceComponents(replacements);
 }
 
 // ---------------------- End IO methods. -------------------------------------
 
@@ skipping 127 matching lines @@
     IOThread* io_thread,
     net::URLRequestContextGetter* getter) {
   // Empty function for unittests.
 }
 
 void SimplePredictor::ShutdownOnUIThread() {
   SetShutdown(true);
 }
 
 }  // namespace chrome_browser_net