Move HostKeyPair into protocol::KeyPair.

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 2d0986d1423b9c0f737a707e360a4a46966e50da..1b8cf9ac5013913ebdae7d6bf2e8d6f11507b879 100644
--- a/remoting/host/heartbeat_sender.h
+++ b/remoting/host/heartbeat_sender.h
@@ -12,8 +12,8 @@
 #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/jingle_glue/signal_strategy.h"
+#include "remoting/protocol/key_pair.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -25,7 +25,7 @@ class XmlElement;
 
 namespace remoting {
 
-class HostKeyPair;
+class protocol::KeyPair;
 class IqRequest;
 class IqSender;
 
@@ -92,7 +92,7 @@ class HeartbeatSender : public SignalStrategy::Listener {
   HeartbeatSender(Listener* listener,
                   const std::string& host_id,
                   SignalStrategy* signal_strategy,
-                  HostKeyPair* key_pair,
+                  protocol::KeyPair* key_pair,

[Wez, 2013/02/23 03:43:20]

Now that KeyPair has Copy(), can we use a scoped_ptr<> here?

[rmsousa, 2013/02/26 02:38:52]

Done.

                   const std::string& directory_bot_jid);
   virtual ~HeartbeatSender();
 
@@ -125,7 +125,7 @@ class HeartbeatSender : public SignalStrategy::Listener {
   Listener* listener_;
   std::string host_id_;
   SignalStrategy* signal_strategy_;
-  HostKeyPair* key_pair_;
+  protocol::KeyPair* key_pair_;
   std::string directory_bot_jid_;
   scoped_ptr<IqSender> iq_sender_;
   scoped_ptr<IqRequest> request_;