Refactor IqRequest.

remoting/jingle_glue/jingle_info_request.h

Index: remoting/jingle_glue/jingle_info_request.h
diff --git a/remoting/jingle_glue/jingle_info_request.h b/remoting/jingle_glue/jingle_info_request.h
index 6d5bcf652c81925877df40292a0deda268e4722e..9843586564412ad2d48582c12e2b68384465b310 100644
--- a/remoting/jingle_glue/jingle_info_request.h
+++ b/remoting/jingle_glue/jingle_info_request.h
@@ -12,10 +12,9 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "remoting/jingle_glue/iq_sender.h"
 #include "third_party/libjingle/source/talk/base/sigslot.h"
 
-class Task;
-
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
@@ -26,9 +25,9 @@ class SocketAddress;
 
 namespace remoting {
 
-class IqRequest;
+class SignalStrategy;
 
-// JingleInfoRequest handles requesting STUN/Relay infromation from
+// JingleInfoRequest handles requesting STUN/Relay information from
 // the Google Talk network. The query is made when Send() is
 // called. The callback given to Send() is called when response to the
 // request is received.
@@ -39,7 +38,7 @@ class IqRequest;
 // TODO(ajwong): Add support for a timeout.
 class JingleInfoRequest : public sigslot::has_slots<> {
  public:
-  // Callback to receive the Jingle configuration settings.  The argumetns are
+  // Callback to receive the Jingle configuration settings.  The arguments are
   // passed by pointer so the receive may call swap on them.  The receiver does
   // NOT own the arguments, which are guaranteed only to be alive for the
   // duration of the callback.
@@ -47,7 +46,7 @@ class JingleInfoRequest : public sigslot::has_slots<> {
       const std::string&, const std::vector<std::string>&,
       const std::vector<talk_base::SocketAddress>&)> OnJingleInfoCallback;
 
-  explicit JingleInfoRequest(IqRequest* request);
+  explicit JingleInfoRequest(SignalStrategy* signal_strategy);
   virtual ~JingleInfoRequest();
 
   void Send(const OnJingleInfoCallback& callback);
@@ -57,6 +56,7 @@ class JingleInfoRequest : public sigslot::has_slots<> {
 
   void OnResponse(const buzz::XmlElement* stanza);
 
+  IqSender iq_sender_;
   scoped_ptr<IqRequest> request_;
   OnJingleInfoCallback on_jingle_info_cb_;