diff options
| author | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 21:34:47 +0000 |
|---|---|---|
| committer | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-28 21:34:47 +0000 |
| commit | 6e78dfb46a07e5ee38225e0cd32fa8b70ed41558 (patch) | |
| tree | c00c45283a8b8f86eb079395ee4ba56c9954c215 /net/socket | |
| parent | a13cc36d904c699cd37f80a1c5200f21a7a54671 (diff) | |
| download | chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.zip chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.gz chromium_src-6e78dfb46a07e5ee38225e0cd32fa8b70ed41558.tar.bz2 | |
HostResolverImpl: don't interpret NULL callback argument as a request to do synchronous resolution.
BUG=90547,60149
TEST=net_unittests
Review URL: http://codereview.chromium.org/7520026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94552 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, 9 insertions, 2 deletions
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index 4f99d5d..68125de 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -67,8 +67,11 @@ void SOCKS5ClientSocketTest::SetUp() { // Resolve the "localhost" AddressList used by the TCP connection to connect. HostResolver::RequestInfo info(HostPortPair("www.socks-proxy.com", 1080)); - int rv = host_resolver_->Resolve(info, &address_list_, NULL, NULL, + TestCompletionCallback callback; + int rv = host_resolver_->Resolve(info, &address_list_, &callback, 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 1692cf3..d57eed6 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc @@ -1055,6 +1055,7 @@ 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 8f377e5..1379f4a 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc @@ -122,7 +122,10 @@ void TransportClientSocketTest::SetUp() { HostResolver::kDefaultRetryAttempts, NULL)); HostResolver::RequestInfo info(HostPortPair("localhost", listen_port_)); - int rv = resolver->Resolve(info, &addr, NULL, NULL, BoundNetLog()); + TestCompletionCallback callback; + int rv = resolver->Resolve(info, &addr, &callback, NULL, BoundNetLog()); + CHECK_EQ(ERR_IO_PENDING, rv); + rv = callback.WaitForResult(); CHECK_EQ(rv, OK); sock_.reset( socket_factory_->CreateTransportClientSocket(addr, |