summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/connection_tester.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 15:18:58 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-07 15:18:58 +0000
commit51c07140c9533c09f348d9fc7dfe5aea6341e618 (patch)
treedf239e1fb59cc734a2010ea2d0b34bcf371646e6 /chrome/browser/net/connection_tester.cc
parentb6207ced7803f1aa72ca31c02705d148ef718cd8 (diff)
downloadchromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.zip
chromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.tar.gz
chromium_src-51c07140c9533c09f348d9fc7dfe5aea6341e618.tar.bz2
net: plumb DnsRRResolver from IOThread to HttpNetworkSession.
This patch gets us most of the way. The next patch finishes plumbing into the SSL client socket pool. BUG=none TEST=none http://codereview.chromium.org/3533013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/connection_tester.cc')
-rw-r--r--chrome/browser/net/connection_tester.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 0ed9f94..91d6afe 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/importer/firefox_proxy_settings.h"
#include "chrome/common/chrome_switches.h"
#include "net/base/cookie_monster.h"
+#include "net/base/dnsrr_resolver.h"
#include "net/base/host_resolver.h"
#include "net/base/host_resolver_impl.h"
#include "net/base/io_buffer.h"
@@ -53,13 +54,15 @@ class ExperimentURLRequestContext : public URLRequestContext {
// The rest of the dependencies are standard, and don't depend on the
// experiment being run.
+ dnsrr_resolver_ = new net::DnsRRResolver;
ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
ssl_config_service_ = new net::SSLConfigServiceDefaults;
http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
host_resolver_);
http_transaction_factory_ = new net::HttpCache(
- net::HttpNetworkLayer::CreateFactory(host_resolver_, proxy_service_,
- ssl_config_service_, http_auth_handler_factory_, NULL, NULL),
+ net::HttpNetworkLayer::CreateFactory(host_resolver_, dnsrr_resolver_,
+ proxy_service_, ssl_config_service_, http_auth_handler_factory_,
+ NULL, NULL),
net::HttpCache::DefaultBackend::InMemory(0));
// In-memory cookie store.
cookie_store_ = new net::CookieMonster(NULL, NULL);
@@ -72,6 +75,7 @@ class ExperimentURLRequestContext : public URLRequestContext {
delete ftp_transaction_factory_;
delete http_transaction_factory_;
delete http_auth_handler_factory_;
+ delete dnsrr_resolver_;
delete host_resolver_;
}