Refactor IqRequest.

remoting/host/heartbeat_sender.h

Index: remoting/host/heartbeat_sender.h
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h
index 2100b67b5ef95d66e34b2d5df9508bcaab75ad19..582bc28f455eb4330dd69c66376e577c28f76bba 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.h
@@ -13,17 +13,21 @@
 #include "base/timer.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_status_observer.h"
-#include "remoting/jingle_glue/iq_request.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
+#include "base/gtest_prod_util.h"

[Wez, 2011/11/03 02:09:30]

Why do we need this?

[Sergey Ulanov, 2011/11/03 02:41:31]

For FRIEND_TEST_ALL_PREFIXES() macro.

 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
+namespace buzz {
+class XmlElement;
+}  // namespace buzz
+
 namespace remoting {
 
-class IqRequest;
 class HostKeyPair;
+class IqRequest;
+class IqSender;
 class MutableHostConfig;
 
 // HeartbeatSender periodically sends heartbeat stanzas to the Chromoting Bot.
@@ -106,6 +110,7 @@ class HeartbeatSender : public HostStatusObserver {
   std::string host_id_;
   HostKeyPair key_pair_;
   std::string full_jid_;
+  scoped_ptr<IqSender> iq_sender_;
   scoped_ptr<IqRequest> request_;
   int interval_ms_;
   base::RepeatingTimer<HeartbeatSender> timer_;