Refactor IqRequest.

remoting/host/heartbeat_sender.h

 // 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.
 
 #ifndef REMOTING_HOST_HEARTBEAT_SENDER_H_
 #define REMOTING_HOST_HEARTBEAT_SENDER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #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 HostKeyPair;
 class IqRequest;
-class HostKeyPair;
+class IqSender;
 class MutableHostConfig;
 
 // HeartbeatSender periodically sends heartbeat stanzas to the Chromoting Bot.
 // Each heartbeat stanza looks as follows:
 //
 // <iq type="set" to="remoting@bot.talk.google.com"
 //     from="user@gmail.com/chromoting123123" id="5" xmlns="jabber:client">
 //   <rem:heartbeat rem:hostid="a1ddb11e-8aef-11df-bccf-18a905b9cb5a"
 //                  xmlns:rem="google:remoting">
 //     <rem:signature rem:time="1279061748">.signature.</rem:signature>
@@ skipping 62 matching lines @@
   // Caller owns the result.
   buzz::XmlElement* CreateHeartbeatMessage();
   buzz::XmlElement* CreateSignature();
 
   State state_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   scoped_refptr<MutableHostConfig> config_;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(HeartbeatSender);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HEARTBEAT_SENDER_H_