diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 00:03:47 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 00:03:47 +0000 |
| commit | 41ed131502926569e3fe2cfeeb7b583306208bcc (patch) | |
| tree | 2c58fb5639713015bb1f8be8566f8e5989acbf7c /remoting/host | |
| parent | 248f0e5e1635ad8061e76d39b08ec390a2e7513f (diff) | |
| download | chromium_src-41ed131502926569e3fe2cfeeb7b583306208bcc.zip chromium_src-41ed131502926569e3fe2cfeeb7b583306208bcc.tar.gz chromium_src-41ed131502926569e3fe2cfeeb7b583306208bcc.tar.bz2 | |
Use new callbacks in the IqRequest interface.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/7744041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/heartbeat_sender.cc | 4 | ||||
| -rw-r--r-- | remoting/host/register_support_host_request.cc | 5 | ||||
| -rw-r--r-- | remoting/host/register_support_host_request_unittest.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc index af739b0..589eb31 100644 --- a/remoting/host/heartbeat_sender.cc +++ b/remoting/host/heartbeat_sender.cc @@ -4,6 +4,7 @@ #include "remoting/host/heartbeat_sender.h" +#include "base/bind.h" #include "base/logging.h" #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" @@ -72,7 +73,8 @@ void HeartbeatSender::OnSignallingConnected(SignalStrategy* signal_strategy, full_jid_ = full_jid; request_.reset(signal_strategy->CreateIqRequest()); - request_->set_callback(NewCallback(this, &HeartbeatSender::ProcessResponse)); + request_->set_callback(base::Bind(&HeartbeatSender::ProcessResponse, + base::Unretained(this))); DoSendStanza(); timer_.Start(base::TimeDelta::FromMilliseconds(interval_ms_), this, diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc index 00045f0..3c47dab 100644 --- a/remoting/host/register_support_host_request.cc +++ b/remoting/host/register_support_host_request.cc @@ -4,6 +4,7 @@ #include "remoting/host/register_support_host_request.h" +#include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" @@ -59,8 +60,8 @@ void RegisterSupportHostRequest::OnSignallingConnected( message_loop_ = MessageLoop::current(); request_.reset(signal_strategy->CreateIqRequest()); - request_->set_callback(NewCallback( - this, &RegisterSupportHostRequest::ProcessResponse)); + request_->set_callback(base::Bind( + &RegisterSupportHostRequest::ProcessResponse, base::Unretained(this))); request_->SendIq(buzz::STR_SET, kChromotingBotJid, CreateRegistrationRequest(jid)); diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc index e08b99d..50c305a 100644 --- a/remoting/host/register_support_host_request_unittest.cc +++ b/remoting/host/register_support_host_request_unittest.cc @@ -129,7 +129,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) { support_id_lifetime->AddText(kSupportIdLifetime); result->AddElement(support_id_lifetime); - iq_request->callback()->Run(response.get()); + iq_request->callback().Run(response.get()); message_loop_.RunAllPending(); } |