diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 23:57:54 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 23:57:54 +0000 |
| commit | 73c4532bd7f5b84bc822a4acca5c5b8affef4129 (patch) | |
| tree | dc2a525aab1bda568b52ea78e72c8be79b9165dc /jingle | |
| parent | 3209e71131849f3e0d513cd3fd8dca881f05d531 (diff) | |
| download | chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.zip chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.tar.gz chromium_src-73c4532bd7f5b84bc822a4acca5c5b8affef4129.tar.bz2 | |
Stop refcounting HostResolver.
BUG=46049
TEST=none
Review URL: http://codereview.chromium.org/3601002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
4 files changed, 6 insertions, 7 deletions
diff --git a/jingle/notifier/communicator/xmpp_connection_generator.cc b/jingle/notifier/communicator/xmpp_connection_generator.cc index 0a78fef..469f3d4 100644 --- a/jingle/notifier/communicator/xmpp_connection_generator.cc +++ b/jingle/notifier/communicator/xmpp_connection_generator.cc @@ -37,7 +37,7 @@ namespace notifier { XmppConnectionGenerator::XmppConnectionGenerator( - const scoped_refptr<net::HostResolver>& host_resolver, + net::HostResolver* host_resolver, const ConnectionOptions* options, bool try_ssltcp_first, const ServerInformation* server_list, diff --git a/jingle/notifier/communicator/xmpp_connection_generator.h b/jingle/notifier/communicator/xmpp_connection_generator.h index 26b040d..0cb969c 100644 --- a/jingle/notifier/communicator/xmpp_connection_generator.h +++ b/jingle/notifier/communicator/xmpp_connection_generator.h @@ -40,7 +40,7 @@ class XmppConnectionGenerator : public sigslot::has_slots<> { // server_list is the list of connections to attempt in priority order. // server_count is the number of items in the server list. XmppConnectionGenerator( - const scoped_refptr<net::HostResolver>& host_resolver, + net::HostResolver* host_resolver, const ConnectionOptions* options, bool try_ssltcp_first, const ServerInformation* server_list, diff --git a/jingle/notifier/listener/mediator_thread_impl.cc b/jingle/notifier/listener/mediator_thread_impl.cc index aea38e7..a9f411f 100644 --- a/jingle/notifier/listener/mediator_thread_impl.cc +++ b/jingle/notifier/listener/mediator_thread_impl.cc @@ -126,9 +126,9 @@ void MediatorThreadImpl::DoLogin( // TODO(akalin): Use an existing HostResolver from somewhere (maybe // the IOThread one). - host_resolver_ = + host_resolver_.reset( net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism, - NULL); + NULL)); notifier::ServerInformation server_list[2]; int server_list_count = 0; @@ -171,7 +171,7 @@ void MediatorThreadImpl::DoDisconnect() { DCHECK_EQ(MessageLoop::current(), worker_message_loop()); LOG(INFO) << "P2P: Thread logging out of talk network."; login_.reset(); - host_resolver_ = NULL; + host_resolver_.reset(); base_task_.reset(); } diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h index 76d296d..1792ca4 100644 --- a/jingle/notifier/listener/mediator_thread_impl.h +++ b/jingle/notifier/listener/mediator_thread_impl.h @@ -24,7 +24,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/thread.h" #include "jingle/notifier/base/notifier_options.h" @@ -115,7 +114,7 @@ class MediatorThreadImpl const NotifierOptions notifier_options_; base::Thread worker_thread_; - scoped_refptr<net::HostResolver> host_resolver_; + scoped_ptr<net::HostResolver> host_resolver_; scoped_ptr<notifier::Login> login_; |