Refactor IqRequest.

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/iq_sender.h"
 #include "remoting/jingle_glue/jingle_thread.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 namespace remoting {
 
@@ skipping 40 matching lines @@
   return true;
 }
 
 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(base::Bind(&HeartbeatSender::ProcessResponse,
-                                    base::Unretained(this)));
+
+  iq_sender_.reset(new IqSender(signal_strategy));
 
   DoSendStanza();
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(interval_ms_), this,
                &HeartbeatSender::DoSendStanza);
 }
 
 void HeartbeatSender::OnSignallingDisconnected() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   state_ = STOPPED;
-  request_.reset(NULL);
+  request_.reset();
+  iq_sender_.reset();
 }
 
 // Ignore any notifications other than signalling
 // connected/disconnected events.
 void HeartbeatSender::OnAccessDenied() { }
 void HeartbeatSender::OnClientAuthenticated(const std::string& jid) { }
 void HeartbeatSender::OnClientDisconnected(const std::string& jid) { }
 void HeartbeatSender::OnShutdown() { }
 
 void HeartbeatSender::DoSendStanza() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STARTED);
 
   VLOG(1) << "Sending heartbeat stanza to " << kChromotingBotJid;
-  request_->SendIq(IqRequest::MakeIqStanza(
-      buzz::STR_SET, kChromotingBotJid, CreateHeartbeatMessage()));
+  request_.reset(iq_sender_->SendIq(
+      buzz::STR_SET, kChromotingBotJid, CreateHeartbeatMessage(),
+      base::Bind(&HeartbeatSender::ProcessResponse,
+                 base::Unretained(this))));
 }
 
 void HeartbeatSender::ProcessResponse(const XmlElement* response) {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   std::string type = response->Attr(buzz::QN_TYPE);
   if (type == buzz::STR_ERROR) {
     LOG(ERROR) << "Received error in response to heartbeat: "
                << response->Str();
     return;
@@ skipping 52 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