net/socket_stream/socket_stream_job.cc - Issue 19269012: Don't persist HPKP if PrivacyMode is enabled.

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 19269012: Don't persist HPKP if PrivacyMode is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address codereview nit and fix compilation error in OFFICIAL_BUILD. Created 7 years, 3 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 9c13a8f3a6661ece0b456762a497124fe3e6867b..7c12cc8c6b3afa4486e375bd1cc1cebcca6d632f 100644

--- a/net/socket_stream/socket_stream_job.cc

+++ b/net/socket_stream/socket_stream_job.cc

@@ -27,8 +27,12 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(

SSLConfigService* ssl) {

GURL socket_url(url);

TransportSecurityState::DomainState domain_state;

- if (url.scheme() == "ws" && sts && sts->GetDomainState(

- url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) &&

+ if (url.scheme() == "ws" && sts &&

+ sts->GetDomainState(

+ url.host(),

+ SSLConfigService::IsSNIAvailable(ssl),

+ delegate->CanGetCookies(NULL, SocketStream::GetURLForCookies(url)),

+ &domain_state) &&

domain_state.ShouldUpgradeToSSL()) {

url_canon::Replacements<char> replacements;

static const char kNewScheme[] = "wss";