summaryrefslogtreecommitdiffstats
path: root/sync
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 /sync
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 'sync')
-rw-r--r--sync/tools/sync_client.cc5
-rw-r--r--sync/tools/sync_listen_notifications.cc5
2 files changed, 2 insertions, 8 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index 01da983..96be8a3 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -105,10 +105,7 @@ class MyTestURLRequestContext : public TestURLRequestContext {
public:
MyTestURLRequestContext() : TestURLRequestContext(true) {
context_storage_.set_host_resolver(
- net::CreateSystemHostResolver(
- net::HostResolver::kDefaultParallelism,
- net::HostResolver::kDefaultRetryAttempts,
- NULL));
+ net::HostResolver::CreateDefaultResolver(NULL));
context_storage_.set_transport_security_state(
new net::TransportSecurityState());
Init();
diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc
index 73d78e3..d8cc213 100644
--- a/sync/tools/sync_listen_notifications.cc
+++ b/sync/tools/sync_listen_notifications.cc
@@ -118,10 +118,7 @@ class MyTestURLRequestContext : public TestURLRequestContext {
public:
MyTestURLRequestContext() : TestURLRequestContext(true) {
context_storage_.set_host_resolver(
- net::CreateSystemHostResolver(
- net::HostResolver::kDefaultParallelism,
- net::HostResolver::kDefaultRetryAttempts,
- NULL));
+ net::HostResolver::CreateDefaultResolver(NULL));
context_storage_.set_transport_security_state(
new net::TransportSecurityState());
Init();