summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 18:17:13 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 18:17:13 +0000
commitbc04b24f04d8afd339c24d9f214481377de2aa56 (patch)
treeb98e69c38d120df34f00b6c1cd6124bceafdc29a /net/url_request
parent36f1e277205d0bc6621866b1242ea7ee00166d4a (diff)
downloadchromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.zip
chromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.tar.gz
chromium_src-bc04b24f04d8afd339c24d9f214481377de2aa56.tar.bz2
Revert "net: Plumb DnsCertProvenanceChecker around."
This reverts commit r66970. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_context.cc1
-rw-r--r--net/url_request/url_request_context.h7
-rw-r--r--net/url_request/url_request_unittest.h1
3 files changed, 0 insertions, 9 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 281aa7e..137901d 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -12,7 +12,6 @@ URLRequestContext::URLRequestContext()
: net_log_(NULL),
host_resolver_(NULL),
dnsrr_resolver_(NULL),
- dns_cert_checker_(NULL),
http_transaction_factory_(NULL),
ftp_transaction_factory_(NULL),
http_auth_handler_factory_(NULL),
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index f935f5f..bbbae67 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -18,12 +18,10 @@
#include "net/base/transport_security_state.h"
#include "net/ftp/ftp_auth_cache.h"
#include "net/proxy/proxy_service.h"
-#include "net/socket/dns_cert_provenance_checker.h"
namespace net {
class CookiePolicy;
class CookieStore;
-class DnsCertProvenanceChecker;
class DnsRRResolver;
class FtpTransactionFactory;
class HostResolver;
@@ -53,10 +51,6 @@ class URLRequestContext
return dnsrr_resolver_;
}
- net::DnsCertProvenanceChecker* dns_cert_checker() const {
- return dns_cert_checker_.get();
- }
-
// Get the proxy service for this context.
net::ProxyService* proxy_service() const {
return proxy_service_;
@@ -130,7 +124,6 @@ class URLRequestContext
net::NetLog* net_log_;
net::HostResolver* host_resolver_;
net::DnsRRResolver* dnsrr_resolver_;
- scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_;
scoped_refptr<net::ProxyService> proxy_service_;
scoped_refptr<net::SSLConfigService> ssl_config_service_;
net::HttpTransactionFactory* http_transaction_factory_;
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 378b133..abb6ab5 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -162,7 +162,6 @@ class TestURLRequestContext : public URLRequestContext {
http_transaction_factory_ = new net::HttpCache(
net::HttpNetworkLayer::CreateFactory(host_resolver_,
NULL /* dnsrr_resolver */,
- NULL /* dns_cert_checker */,
NULL /* ssl_host_info_factory */,
proxy_service_,
ssl_config_service_,