summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/connection_tester_unittest.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 17:47:27 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 17:47:27 +0000
commita2a4197d76cfe41bcad28ec1204bb53a360bd3f1 (patch)
tree0aa2be92bc9ab632c33febb219040bb4fb561cd5 /chrome/browser/net/connection_tester_unittest.cc
parent6e5ad865c61adb98f8f5d4c22ecb238478a9a368 (diff)
downloadchromium_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 'chrome/browser/net/connection_tester_unittest.cc')
-rw-r--r--chrome/browser/net/connection_tester_unittest.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index b3dd1f3..3540990 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -8,7 +8,6 @@
#include "content/test/test_browser_thread.h"
#include "net/base/cert_verifier.h"
#include "net/base/cookie_monster.h"
-#include "net/base/dnsrr_resolver.h"
#include "net/base/mock_host_resolver.h"
#include "net/base/ssl_config_service_defaults.h"
#include "net/ftp/ftp_network_layer.h"
@@ -108,7 +107,6 @@ class ConnectionTesterTest : public PlatformTest {
ConnectionTesterDelegate test_delegate_;
net::MockHostResolver host_resolver_;
net::CertVerifier cert_verifier_;
- net::DnsRRResolver dnsrr_resolver_;
scoped_ptr<net::ProxyService> proxy_service_;
scoped_refptr<net::SSLConfigService> ssl_config_service_;
scoped_ptr<net::HttpTransactionFactory> http_transaction_factory_;
@@ -120,7 +118,6 @@ class ConnectionTesterTest : public PlatformTest {
void InitializeRequestContext() {
proxy_script_fetcher_context_->set_host_resolver(&host_resolver_);
proxy_script_fetcher_context_->set_cert_verifier(&cert_verifier_);
- proxy_script_fetcher_context_->set_dnsrr_resolver(&dnsrr_resolver_);
proxy_script_fetcher_context_->set_http_auth_handler_factory(
&http_auth_handler_factory_);
proxy_service_.reset(net::ProxyService::CreateDirect());
@@ -129,7 +126,6 @@ class ConnectionTesterTest : public PlatformTest {
net::HttpNetworkSession::Params session_params;
session_params.host_resolver = &host_resolver_;
session_params.cert_verifier = &cert_verifier_;
- session_params.dnsrr_resolver = &dnsrr_resolver_;
session_params.http_auth_handler_factory = &http_auth_handler_factory_;
session_params.ssl_config_service = ssl_config_service_;
session_params.proxy_service = proxy_service_.get();