Use new callbacks in the IqRequest interface.

remoting/host/heartbeat_sender.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/time.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/host_config.h"
 #include "remoting/jingle_glue/iq_request.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ skipping 48 matching lines @@
 }
 
 void HeartbeatSender::OnSignallingConnected(SignalStrategy* signal_strategy,
                                             const std::string& full_jid) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == INITIALIZED || state_ == STOPPED);
   state_ = STARTED;
 
   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,
                &HeartbeatSender::DoSendStanza);
 }
 
 void HeartbeatSender::OnSignallingDisconnected() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   state_ = STOPPED;
   request_.reset(NULL);
@@ skipping 79 matching lines @@
       QName(kChromotingXmlNamespace, kSignatureTimeAttr), time_str);
 
   std::string message = full_jid_ + ' ' + time_str;
   std::string signature(key_pair_.GetSignature(message));
   signature_tag->AddText(signature);
 
   return signature_tag;
 }
 
 }  // namespace remoting