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

Unified Diff: net/url_request/url_request.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:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request.cc
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index dbff821796eeb8426ac78dad933043717ab3ceb7..404680f13cd6de507626d994066831efd6f74dc8 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -1065,13 +1065,11 @@ bool URLRequest::GetHSTSRedirect(GURL* redirect_url) const {
const GURL& url = this->url();
if (!url.SchemeIs("http"))
return false;
- TransportSecurityState::DomainState domain_state;
- if (context()->transport_security_state() &&
- context()->transport_security_state()->GetDomainState(
+ TransportSecurityState* state = context()->transport_security_state();
+ if (state &&
+ state->ShouldUpgradeToSSL(
url.host(),
- SSLConfigService::IsSNIAvailable(context()->ssl_config_service()),
- &domain_state) &&
- domain_state.ShouldUpgradeToSSL()) {
+ SSLConfigService::IsSNIAvailable(context()->ssl_config_service()))) {
url_canon::Replacements<char> replacements;
const char kNewScheme[] = "https";
replacements.SetScheme(kNewScheme,

Powered by Google App Engine
This is Rietveld 408576698