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

Unified Diff: net/url_request/url_request_http_job.cc

Issue 6930040: Refactor to address URLRequestContext dependency added in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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_http_job.cc
===================================================================
--- net/url_request/url_request_http_job.cc (revision 84202)
+++ net/url_request/url_request_http_job.cc (working copy)
@@ -192,7 +192,8 @@
request->context()->transport_security_state()->IsEnabledForHost(
&domain_state,
request->url().host(),
- request->context()->IsSNIAvailable())) {
+ SSLConfigService::IsSNIAvailable(
willchan no longer on Chromium 2011/05/05 18:00:35 please include ssl_config_service.h for this
Chris Evans 2011/05/05 22:00:56 Done.
+ request->context()->ssl_config_service()))) {
if (domain_state.mode ==
TransportSecurityState::DomainState::MODE_STRICT) {
DCHECK_EQ(request->url().scheme(), "http");
@@ -675,7 +676,8 @@
if (context_->transport_security_state()->HasPinsForHost(
&domain_state,
request_->url().host(),
- context_->IsSNIAvailable())) {
+ SSLConfigService::IsSNIAvailable(
+ context_->ssl_config_service()))) {
if (!domain_state.IsChainOfPublicKeysPermitted(
ssl_info.public_key_hashes)) {
result = ERR_CERT_INVALID;
@@ -734,7 +736,8 @@
TransportSecurityState::DomainState domain_state;
// TODO(agl): don't ignore opportunistic mode.
const bool r = context_->transport_security_state()->IsEnabledForHost(
- &domain_state, request_info_.url.host(), context_->IsSNIAvailable());
+ &domain_state, request_info_.url.host(),
+ SSLConfigService::IsSNIAvailable(context_->ssl_config_service()));
return !r || domain_state.mode ==
TransportSecurityState::DomainState::MODE_OPPORTUNISTIC;

Powered by Google App Engine
This is Rietveld 408576698