diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 14:32:37 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 14:32:37 +0000 |
| commit | 2db58053f8e04deaf129724bdf8ec0b326fb65ac (patch) | |
| tree | a4bddfa6d1b53f6b314fe7917954875b1a348200 /net/http/http_network_transaction_unittest.cc | |
| parent | 15d2d47109de2bdfdece9cdb1956b3e8ab73c475 (diff) | |
| download | chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.zip chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.tar.gz chromium_src-2db58053f8e04deaf129724bdf8ec0b326fb65ac.tar.bz2 | |
Revert revert "net: plumb DnsRRResolver from IOThread to HttpNetworkSession."
Landed in r61789, reverted in r61801 in case it was causing Vista Tests
(dbg)(1) to crash. Turns out that it wasn't, so this is the reland.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index ca3caac..508cc28 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -104,6 +104,7 @@ ProxyService* CreateFixedProxyService(const std::string& proxy) { HttpNetworkSession* CreateSession(SessionDependencies* session_deps) { return new HttpNetworkSession(session_deps->host_resolver.get(), + NULL /* dnsrr_resolver */, session_deps->proxy_service, &session_deps->socket_factory, session_deps->ssl_config_service, @@ -304,7 +305,7 @@ template<> CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( HttpNetworkSession* session) : SSLClientSocketPool(0, 0, NULL, session->host_resolver(), NULL, NULL, - NULL, NULL, NULL, NULL) {} + NULL, NULL, NULL, NULL, NULL) {} //----------------------------------------------------------------------------- |