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