Refactor IqRequest.

remoting/jingle_glue/jingle_info_request.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/jingle_glue/jingle_info_request.h"
 
 #include "base/bind.h"
 #include "base/task.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "net/base/net_util.h"
-#include "remoting/jingle_glue/iq_request.h"
+#include "remoting/jingle_glue/iq_sender.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 namespace remoting {
 
-
-JingleInfoRequest::JingleInfoRequest(IqRequest* request)
-    : request_(request) {
-  request_->set_callback(base::Bind(&JingleInfoRequest::OnResponse,
-                                    base::Unretained(this)));
+JingleInfoRequest::JingleInfoRequest(SignalStrategy* signal_strategy)
+    : iq_sender_(signal_strategy) {
 }
 
 JingleInfoRequest::~JingleInfoRequest() {
 }
 
 void JingleInfoRequest::Send(const OnJingleInfoCallback& callback) {
   on_jingle_info_cb_ = callback;
-  request_->SendIq(IqRequest::MakeIqStanza(
-      buzz::STR_GET, buzz::STR_EMPTY,
-      new buzz::XmlElement(buzz::QN_JINGLE_INFO_QUERY, true)));
+  buzz::XmlElement* iq_body =
+      new buzz::XmlElement(buzz::QN_JINGLE_INFO_QUERY, true);
+  request_.reset(iq_sender_.SendIq(
+      buzz::STR_GET, buzz::STR_EMPTY, iq_body,
+      base::Bind(&JingleInfoRequest::OnResponse, base::Unretained(this))));
 }
 
 void JingleInfoRequest::OnResponse(const buzz::XmlElement* stanza) {
   const buzz::XmlElement* query =
       stanza->FirstNamed(buzz::QN_JINGLE_INFO_QUERY);
   if (query == NULL) {
     LOG(WARNING) << "No Jingle info found in Jingle Info query response."
                  << stanza->Str();
     return;
   }
@@ skipping 31 matching lines @@
       std::string host = server->Attr(buzz::QN_JINGLE_INFO_HOST);
       if (host != buzz::STR_EMPTY)
         relay_hosts.push_back(host);
     }
   }
 
   on_jingle_info_cb_.Run(relay_token, relay_hosts, stun_hosts);
 }
 
 }  // namespace remoting