summaryrefslogtreecommitdiffstats
path: root/net/proxy
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 /net/proxy
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 'net/proxy')
-rw-r--r--net/proxy/proxy_script_fetcher_impl_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc
index c12f829..39d223c 100644
--- a/net/proxy/proxy_script_fetcher_impl_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc
@@ -73,7 +73,7 @@ class RequestContext : public URLRequestContext {
public:
RequestContext() : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
ProxyConfig no_proxy;
- storage_.set_host_resolver(new MockHostResolver);
+ storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
storage_.set_cert_verifier(new MockCertVerifier);
storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy));
storage_.set_ssl_config_service(new SSLConfigServiceDefaults);