diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 17:29:30 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 17:29:30 +0000 |
| commit | 6ae89674d638729059018d02c11cb0881b9cf14f (patch) | |
| tree | cf4d422d34148fc0a907f27d14ac881af412220e /net/socket/socket_test_util.cc | |
| parent | 2fb382fd01716825e026c7833b6d170b5f412a08 (diff) | |
| download | chromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.zip chromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.tar.gz chromium_src-6ae89674d638729059018d02c11cb0881b9cf14f.tar.bz2 | |
Revert "net: plumb DnsRRResolver from IOThread to HttpNetworkSession."
This reverts r61789. It may have broken Vista Tests (dbg), maybe.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
| -rw-r--r-- | net/socket/socket_test_util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index cba4b1c..1cf894a 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -1242,7 +1242,7 @@ MockSSLClientSocketPool::MockSSLClientSocketPool( ClientSocketFactory* socket_factory, TCPClientSocketPool* tcp_pool) : SSLClientSocketPool(max_sockets, max_sockets_per_group, histograms, - NULL, NULL, socket_factory, + NULL, socket_factory, tcp_pool, NULL, NULL, NULL, NULL), client_socket_factory_(socket_factory), |