Make HSTS headers not clobber preloaded pins.

net/socket_stream/socket_stream_job.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/socket_stream/socket_stream_job.h"
 
 #include "base/memory/singleton.h"
 #include "net/http/transport_security_state.h"
 #include "net/socket_stream/socket_stream_job_manager.h"
 #include "net/ssl/ssl_config_service.h"
@@ skipping 10 matching lines @@
 
 // static
 SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
     const GURL& url,
     SocketStream::Delegate* delegate,
     TransportSecurityState* sts,
     SSLConfigService* ssl,
     URLRequestContext* context,
     CookieStore* cookie_store) {
   GURL socket_url(url);
-  TransportSecurityState::DomainState domain_state;
-  if (url.scheme() == "ws" && sts && sts->GetDomainState(
-          url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) &&
-      domain_state.ShouldUpgradeToSSL()) {
+  if (url.scheme() == "ws" && sts &&
+      sts->ShouldUpgradeToSSL(url.host(),
+                              SSLConfigService::IsSNIAvailable(ssl))) {
     url::Replacements<char> replacements;
     static const char kNewScheme[] = "wss";
     replacements.SetScheme(kNewScheme, url::Component(0, strlen(kNewScheme)));
     socket_url = url.ReplaceComponents(replacements);
   }
   return SocketStreamJobManager::GetInstance()->CreateJob(
       socket_url, delegate, context, cookie_store);
 }
 
 SocketStreamJob::SocketStreamJob() {}
@@ skipping 40 matching lines @@
 }
 
 void SocketStreamJob::DetachContext() {
   if (socket_.get())
     socket_->DetachContext();
 }
 
 SocketStreamJob::~SocketStreamJob() {}
 
 }  // namespace net