summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 22:09:43 +0000
committerszym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 22:09:43 +0000
commitc54a891830503a20f4264f52c4959619e4e33cf2 (patch)
tree24be2a9fdca4f94da890ddb33f0dfa131ff04a0c /webkit
parent4ed2a60f39eaa2060a454ee99f72b5f84e1fbe5d (diff)
downloadchromium_src-c54a891830503a20f4264f52c4959619e4e33cf2.zip
chromium_src-c54a891830503a20f4264f52c4959619e4e33cf2.tar.gz
chromium_src-c54a891830503a20f4264f52c4959619e4e33cf2.tar.bz2
[net] Change factory methods for HostResolver and HostCache to return a scoped_ptr.
Move HostResolver factory methods to host_resolver.cc. This also fixes a double-free in ShellURLRequestContextGetter. Review URL: https://chromiumcodereview.appspot.com/10831277 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_request_context.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 8fef578..0ab9839 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -77,10 +77,7 @@ void TestShellRequestContext::Init(
net::ProxyService::CreateSystemProxyConfigService(
base::ThreadTaskRunnerHandle::Get(), NULL));
#endif
- storage_.set_host_resolver(
- net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
- net::HostResolver::kDefaultRetryAttempts,
- NULL));
+ storage_.set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
proxy_config_service.release(), 0, NULL));