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/proxy | |
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/proxy')
-rw-r--r-- | net/proxy/proxy_resolver_js_bindings_unittest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/proxy/proxy_resolver_js_bindings_unittest.cc b/net/proxy/proxy_resolver_js_bindings_unittest.cc index 1c580b9..2942978 100644 --- a/net/proxy/proxy_resolver_js_bindings_unittest.cc +++ b/net/proxy/proxy_resolver_js_bindings_unittest.cc @@ -14,7 +14,6 @@ #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" @@ -92,10 +91,6 @@ 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()); |