summaryrefslogtreecommitdiffstats
path: root/net/test
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/test
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/test')
-rw-r--r--net/test/base_test_server.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/test/base_test_server.cc b/net/test/base_test_server.cc
index 7ca7f7f..d13d57c 100644
--- a/net/test/base_test_server.cc
+++ b/net/test/base_test_server.cc
@@ -168,10 +168,7 @@ std::string BaseTestServer::GetScheme() const {
bool BaseTestServer::GetAddressList(AddressList* address_list) const {
DCHECK(address_list);
- scoped_ptr<HostResolver> resolver(
- CreateSystemHostResolver(HostResolver::kDefaultParallelism,
- HostResolver::kDefaultRetryAttempts,
- NULL));
+ scoped_ptr<HostResolver> resolver(HostResolver::CreateDefaultResolver(NULL));
HostResolver::RequestInfo info(host_port_pair_);
TestCompletionCallback callback;
int rv = resolver->Resolve(info, address_list, callback.callback(), NULL,