From d5a4dd65f33e42ff766013a4f4ff3cf4a52673e5 Mon Sep 17 00:00:00 2001 From: "szym@chromium.org" Date: Wed, 23 May 2012 01:41:04 +0000 Subject: [net] Switch TestURLRequestContext and other tests to use MockCachingHostResolver or MockHostResolver. Make explicit when HostResolver::Resolve is expected to never complete in tests. Clean up TestURLRequestContext API. BUG=126016,128745 TEST=net_unittests; jingle_unittests; sync_unit_tests Review URL: https://chromiumcodereview.appspot.com/10408067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138413 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_script_fetcher_impl_unittest.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'net/proxy') diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index dd95e7e..9e9187a 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -11,6 +11,7 @@ #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "net/base/mock_cert_verifier.h" +#include "net/base/mock_host_resolver.h" #include "net/base/net_util.h" #include "net/base/load_flags.h" #include "net/base/ssl_config_service_defaults.h" @@ -70,10 +71,7 @@ class RequestContext : public URLRequestContext { public: RequestContext() : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { ProxyConfig no_proxy; - storage_.set_host_resolver( - CreateSystemHostResolver(HostResolver::kDefaultParallelism, - HostResolver::kDefaultRetryAttempts, - NULL)); + storage_.set_host_resolver(new MockHostResolver); storage_.set_cert_verifier(new MockCertVerifier); storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); storage_.set_ssl_config_service(new SSLConfigServiceDefaults); -- cgit v1.1