net/socket_stream/socket_stream_job.cc - Issue 103803012: Make HSTS headers not clobber preloaded pins.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix browser_tests by setting the domain name correctly. Rebase. Created 6 years, 8 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:

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 f2de82324ac69b1a8a1e8c9ebae3446757a4c4e1..a2bb7810dbbd4b75d096b6ef400719e67f657616 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_canon::Replacements<char> replacements;

static const char kNewScheme[] = "wss";

replacements.SetScheme(kNewScheme,