diff options
| author | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 02:20:06 +0000 |
|---|---|---|
| committer | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 02:20:06 +0000 |
| commit | 10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f (patch) | |
| tree | dcb6c2c826253b016e477c7466da3ca0d4982160 /net/socket | |
| parent | 0be241219a6cecb753ae4fdfb049f75530353771 (diff) | |
| download | chromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.zip chromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.tar.gz chromium_src-10b71b546ae4ce616bd2a26c5fcadfdfcddf4e3f.tar.bz2 | |
Revert 94412 - HostResolverImpl: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149
TEST=net_unittests --gtest_filter="HostResolverImplTest*"
Review URL: http://codereview.chromium.org/7465046
TBR=agayev@chromium.org
Review URL: http://codereview.chromium.org/7524018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/socks5_client_socket_unittest.cc | 5 | ||||
| -rw-r--r-- | net/socket/transport_client_socket_pool_unittest.cc | 1 | ||||
| -rw-r--r-- | net/socket/transport_client_socket_unittest.cc | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index 68125de..4f99d5d 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -67,11 +67,8 @@ void SOCKS5ClientSocketTest::SetUp() { // Resolve the "localhost" AddressList used by the TCP connection to connect. HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080)); - TestCompletionCallback callback; - int rv = host_resolver_->Resolve(info, &address_list_, &callback, NULL, + int rv = host_resolver_->Resolve(info, &address_list_, NULL, NULL, BoundNetLog()); - ASSERT_EQ(ERR_IO_PENDING, rv); - rv = callback.WaitForResult(); ASSERT_EQ(OK, rv); } diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index d57eed6..1692cf3 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -1055,7 +1055,6 @@ TEST_F(TransportClientSocketPoolTest, BackupSocketFailAfterDelay) { }; client_socket_factory_.set_client_socket_types(case_types, 2); - client_socket_factory_.set_delay_ms(5000); EXPECT_EQ(0, pool_.IdleSocketCount()); diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 1379f4a..8f377e5 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -122,10 +122,7 @@ void TransportClientSocketTest::SetUp() { HostResolver::kDefaultRetryAttempts, NULL)); HostResolver::RequestInfo info(HostPortPair("localhost", listen_port_)); - TestCompletionCallback callback; - int rv = resolver->Resolve(info, &addr, &callback, NULL, BoundNetLog()); - CHECK_EQ(ERR_IO_PENDING, rv); - rv = callback.WaitForResult(); + int rv = resolver->Resolve(info, &addr, NULL, NULL, BoundNetLog()); CHECK_EQ(rv, OK); sock_.reset( socket_factory_->CreateTransportClientSocket(addr, |