summaryrefslogtreecommitdiffstats
path: root/webkit/tools
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 /webkit/tools
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 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell_request_context.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 0cb19ed..0eace44 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -74,8 +74,9 @@ void TestShellRequestContext::Init(
cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
net::HttpCache* cache =
- new net::HttpCache(host_resolver_, proxy_service_, ssl_config_service_,
- http_auth_handler_factory_, NULL, NULL, backend);
+ new net::HttpCache(host_resolver_, NULL, proxy_service_,
+ ssl_config_service_, http_auth_handler_factory_, NULL,
+ NULL, backend);
cache->set_mode(cache_mode);
http_transaction_factory_ = cache;