Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: net/socket_stream/socket_stream_job.cc

Issue 103803012: Make HSTS headers not clobber preloaded pins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to comments and fix compilation errors. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket_stream/socket_stream_job.cc
diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc
index 0bd702686bd7db13b437e04f0e73f1b9973911fc..a481b97526e2a314373d5331e60710fce9720aac 100644
--- a/net/socket_stream/socket_stream_job.cc
+++ b/net/socket_stream/socket_stream_job.cc
@@ -28,10 +28,9 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
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)));

Powered by Google App Engine
This is Rietveld 408576698