summaryrefslogtreecommitdiffstats
path: root/jingle
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 /jingle
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 'jingle')
-rw-r--r--jingle/notifier/communicator/single_login_attempt_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 9076015..7b35c3c 100644
--- a/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -73,7 +73,8 @@ class FakeDelegate : public SingleLoginAttempt::Delegate {
class MyTestURLRequestContext : public TestURLRequestContext {
public:
MyTestURLRequestContext() : TestURLRequestContext(true) {
- context_storage_.set_host_resolver(new net::HangingHostResolver());
+ context_storage_.set_host_resolver(
+ scoped_ptr<net::HostResolver>(new net::HangingHostResolver()));
Init();
}
virtual ~MyTestURLRequestContext() {}