From 6e78dfb46a07e5ee38225e0cd32fa8b70ed41558 Mon Sep 17 00:00:00 2001 From: "agayev@chromium.org" Date: Thu, 28 Jul 2011 21:34:47 +0000 Subject: 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 --- net/proxy/proxy_resolver_js_bindings_unittest.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'net/proxy') diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index 2942978..1c580b9 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -14,6 +14,7 @@ #include "net/base/net_log_unittest.h" #include "net/base/net_util.h" #include "net/base/sys_addrinfo.h" +#include "net/base/test_completion_callback.h" #include "net/proxy/proxy_resolver_request_context.h" #include "net/proxy/sync_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" @@ -91,6 +92,10 @@ class MockFailingHostResolver : public SyncHostResolver { class MockSyncHostResolver : public SyncHostResolver { public: + MockSyncHostResolver() { + resolver_.set_synchronous_mode(true); + } + virtual int Resolve(const HostResolver::RequestInfo& info, AddressList* addresses) OVERRIDE { return resolver_.Resolve(info, addresses, NULL, NULL, BoundNetLog()); -- cgit v1.1