| Index: net/test/spawned_test_server/base_test_server.cc
|
| diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
|
| index cc29b3f403085467a86e27f4e0e8d506f0c2d404..d7dbf95fb2d7014eeae85d17c383a74b4ffd9a36 100644
|
| --- a/net/test/spawned_test_server/base_test_server.cc
|
| +++ b/net/test/spawned_test_server/base_test_server.cc
|
| @@ -352,12 +352,9 @@ bool BaseTestServer::GetAddressList(AddressList* address_list) const {
|
| // IPv6 literal hostnames.
|
| info.set_address_family(ADDRESS_FAMILY_IPV4);
|
| TestCompletionCallback callback;
|
| - int rv = resolver->Resolve(info,
|
| - DEFAULT_PRIORITY,
|
| - address_list,
|
| - callback.callback(),
|
| - NULL,
|
| - BoundNetLog());
|
| + std::unique_ptr<HostResolver::Request> request;
|
| + int rv = resolver->Resolve(info, DEFAULT_PRIORITY, address_list,
|
| + callback.callback(), &request, BoundNetLog());
|
| if (rv == ERR_IO_PENDING)
|
| rv = callback.WaitForResult();
|
| if (rv != OK) {
|
|
|