diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:01:15 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 18:01:15 +0000 |
| commit | 2bb044402ba016977b58014a22b0631ab7ed605d (patch) | |
| tree | 6e85bb65048d4b262b6bb4e1d6d0e418957b857d /net/socket | |
| parent | 8748bdf9fe94b62e76e7adf7fac9af7dfd9c0ca3 (diff) | |
| download | chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.zip chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.tar.gz chromium_src-2bb044402ba016977b58014a22b0631ab7ed605d.tar.bz2 | |
Revert 56539 - Added HostResolveImpl Requests and Jobs to log.
ConnectJobs point to the requests, Requests point back to ConnectJobs and to the DNS lookup they were attached to, if any.
Also CONNECT_JOBs are now identified by their host/port on the Requests list.
BUG= 46844
TEST= Look at the net-internals screen.
Review URL: http://codereview.chromium.org/3080034
TBR=eroman@chromium.org
Review URL: http://codereview.chromium.org/3137022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 3 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_unittest.cc | 3 | ||||
| -rw-r--r-- | net/socket/tcp_pinger_unittest.cc | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index e93ad11..6673ec6 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -27,8 +27,7 @@ class SSLClientSocketTest : public PlatformTest { public: SSLClientSocketTest() : resolver_(net::CreateSystemHostResolver( - net::HostResolver::kDefaultParallelism, - NULL)), + net::HostResolver::kDefaultParallelism)), socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) { } diff --git a/net/socket/tcp_client_socket_unittest.cc b/net/socket/tcp_client_socket_unittest.cc index 6117fae..def7596 100644 --- a/net/socket/tcp_client_socket_unittest.cc +++ b/net/socket/tcp_client_socket_unittest.cc @@ -92,8 +92,7 @@ void TCPClientSocketTest::SetUp() { AddressList addr; scoped_refptr<HostResolver> resolver( - CreateSystemHostResolver(HostResolver::kDefaultParallelism, - NULL)); + CreateSystemHostResolver(HostResolver::kDefaultParallelism)); HostResolver::RequestInfo info("localhost", listen_port_); int rv = resolver->Resolve(info, &addr, NULL, NULL, BoundNetLog()); CHECK_EQ(rv, OK); diff --git a/net/socket/tcp_pinger_unittest.cc b/net/socket/tcp_pinger_unittest.cc index 7aebfbc..77ce578 100644 --- a/net/socket/tcp_pinger_unittest.cc +++ b/net/socket/tcp_pinger_unittest.cc @@ -66,8 +66,7 @@ void TCPPingerTest::SetUp() { TEST_F(TCPPingerTest, Ping) { net::AddressList addr; scoped_refptr<net::HostResolver> resolver( - net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, - NULL)); + net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism)); net::HostResolver::RequestInfo info("localhost", listen_port_); int rv = resolver->Resolve(info, &addr, NULL, NULL, net::BoundNetLog()); @@ -81,8 +80,7 @@ TEST_F(TCPPingerTest, Ping) { TEST_F(TCPPingerTest, PingFail) { net::AddressList addr; scoped_refptr<net::HostResolver> resolver( - net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, - NULL)); + net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism)); // "Kill" "server" listen_sock_ = NULL; |