diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 17:47:27 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 17:47:27 +0000 |
commit | a2a4197d76cfe41bcad28ec1204bb53a360bd3f1 (patch) | |
tree | 0aa2be92bc9ab632c33febb219040bb4fb561cd5 /net/url_request | |
parent | 6e5ad865c61adb98f8f5d4c22ecb238478a9a368 (diff) | |
download | chromium_src-a2a4197d76cfe41bcad28ec1204bb53a360bd3f1.zip chromium_src-a2a4197d76cfe41bcad28ec1204bb53a360bd3f1.tar.gz chromium_src-a2a4197d76cfe41bcad28ec1204bb53a360bd3f1.tar.bz2 |
net: replace DnsRRResoler with TransportSecurityState in plumbing.
The DnsRRResoler has served its time and I don't have any further plans for it.
The TransportSecurityState will be used (in a future CL) to enforce public key
pinning at certificate verification time. Currently we only enforce it in
url_request_http_job.cc which means that we've already sent the HTTP request
(inc cookies) by the time we catch the problem. This was expeditious while we
fixed some other issues, but it's time to fix it.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/8692012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r-- | net/url_request/url_request_context.cc | 2 | ||||
-rw-r--r-- | net/url_request/url_request_context.h | 10 | ||||
-rw-r--r-- | net/url_request/url_request_context_storage.cc | 7 | ||||
-rw-r--r-- | net/url_request/url_request_context_storage.h | 3 |
4 files changed, 0 insertions, 22 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc index ccfb5649..142068e 100644 --- a/net/url_request/url_request_context.cc +++ b/net/url_request/url_request_context.cc @@ -19,7 +19,6 @@ URLRequestContext::URLRequestContext() host_resolver_(NULL), cert_verifier_(NULL), origin_bound_cert_service_(NULL), - dnsrr_resolver_(NULL), dns_cert_checker_(NULL), fraudulent_certificate_reporter_(NULL), http_auth_handler_factory_(NULL), @@ -39,7 +38,6 @@ void URLRequestContext::CopyFrom(URLRequestContext* other) { set_host_resolver(other->host_resolver()); set_cert_verifier(other->cert_verifier()); set_origin_bound_cert_service(other->origin_bound_cert_service()); - set_dnsrr_resolver(other->dnsrr_resolver()); set_dns_cert_checker(other->dns_cert_checker()); set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter()); set_http_auth_handler_factory(other->http_auth_handler_factory()); diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index 1ac2b16..b3ccd3b 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -26,7 +26,6 @@ namespace net { class CertVerifier; class CookieStore; class DnsCertProvenanceChecker; -class DnsRRResolver; class FraudulentCertificateReporter; class FtpTransactionFactory; class HostResolver; @@ -88,14 +87,6 @@ class NET_EXPORT URLRequestContext origin_bound_cert_service_ = origin_bound_cert_service; } - DnsRRResolver* dnsrr_resolver() const { - return dnsrr_resolver_; - } - - void set_dnsrr_resolver(DnsRRResolver* dnsrr_resolver) { - dnsrr_resolver_ = dnsrr_resolver; - } - DnsCertProvenanceChecker* dns_cert_checker() const { return dns_cert_checker_; } @@ -225,7 +216,6 @@ class NET_EXPORT URLRequestContext HostResolver* host_resolver_; CertVerifier* cert_verifier_; OriginBoundCertService* origin_bound_cert_service_; - DnsRRResolver* dnsrr_resolver_; DnsCertProvenanceChecker* dns_cert_checker_; FraudulentCertificateReporter* fraudulent_certificate_reporter_; HttpAuthHandlerFactory* http_auth_handler_factory_; diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc index e73bd8e..4f0a2b0 100644 --- a/net/url_request/url_request_context_storage.cc +++ b/net/url_request/url_request_context_storage.cc @@ -7,7 +7,6 @@ #include "base/logging.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_store.h" -#include "net/base/dnsrr_resolver.h" #include "net/base/host_resolver.h" #include "net/base/net_log.h" #include "net/base/network_delegate.h" @@ -52,12 +51,6 @@ void URLRequestContextStorage::set_origin_bound_cert_service( origin_bound_cert_service_.reset(origin_bound_cert_service); } -void URLRequestContextStorage::set_dnsrr_resolver( - DnsRRResolver* dnsrr_resolver) { - context_->set_dnsrr_resolver(dnsrr_resolver); - dnsrr_resolver_.reset(dnsrr_resolver); -} - void URLRequestContextStorage::set_dns_cert_checker( DnsCertProvenanceChecker* dns_cert_checker) { context_->set_dns_cert_checker(dns_cert_checker); diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h index 2c839cc..4a2df3d 100644 --- a/net/url_request/url_request_context_storage.h +++ b/net/url_request/url_request_context_storage.h @@ -16,7 +16,6 @@ namespace net { class CertVerifier; class CookieStore; class DnsCertProvenanceChecker; -class DnsRRResolver; class FraudulentCertificateReporter; class FtpTransactionFactory; class HostResolver; @@ -50,7 +49,6 @@ class NET_EXPORT URLRequestContextStorage { void set_cert_verifier(CertVerifier* cert_verifier); void set_origin_bound_cert_service( OriginBoundCertService* origin_bound_cert_service); - void set_dnsrr_resolver(DnsRRResolver* dnsrr_resolver); void set_dns_cert_checker(DnsCertProvenanceChecker* dns_cert_checker); void set_fraudulent_certificate_reporter( FraudulentCertificateReporter* fraudulent_certificate_reporter); @@ -80,7 +78,6 @@ class NET_EXPORT URLRequestContextStorage { scoped_ptr<HostResolver> host_resolver_; scoped_ptr<CertVerifier> cert_verifier_; scoped_ptr<OriginBoundCertService> origin_bound_cert_service_; - scoped_ptr<DnsRRResolver> dnsrr_resolver_; scoped_ptr<DnsCertProvenanceChecker> dns_cert_checker_; scoped_ptr<FraudulentCertificateReporter> fraudulent_certificate_reporter_; scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_; |