summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
Diffstat (limited to 'net/test')
-rw-r--r--net/test/test_server.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc
index dd36bce..8723215 100644
--- a/net/test/test_server.cc
+++ b/net/test/test_server.cc
@@ -200,7 +200,11 @@ bool TestServer::GetAddressList(AddressList* address_list) const {
HostResolver::kDefaultRetryAttempts,
NULL));
HostResolver::RequestInfo info(host_port_pair_);
- int rv = resolver->Resolve(info, address_list, NULL, NULL, BoundNetLog());
+ TestCompletionCallback callback;
+ int rv = resolver->Resolve(info, address_list, &callback, NULL,
+ BoundNetLog());
+ if (rv == ERR_IO_PENDING)
+ rv = callback.WaitForResult();
if (rv != net::OK) {
LOG(ERROR) << "Failed to resolve hostname: " << host_port_pair_.host();
return false;