Move HostKeyPair into protocol::KeyPair.

remoting/host/heartbeat_sender_unittest.cc

Index: remoting/host/heartbeat_sender_unittest.cc
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 094793748f1cc297f39fd41c6451dddd2500b15e..4bffc7df9380786a7bfd772347943c890158cc13 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -11,10 +11,10 @@
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
-#include "remoting/host/host_key_pair.h"
 #include "remoting/host/test_key_pair.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/mock_objects.h"
+#include "remoting/protocol/key_pair.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ -84,7 +84,7 @@ class HeartbeatSenderTest
   MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
   std::set<SignalStrategy::Listener*> signal_strategy_listeners_;
-  HostKeyPair key_pair_;
+  protocol::KeyPair key_pair_;
   scoped_ptr<HeartbeatSender> heartbeat_sender_;
 };
 
@@ -236,7 +236,7 @@ void HeartbeatSenderTest::ValidateHeartbeatStanza(
   ASSERT_TRUE(signature != NULL);
   EXPECT_TRUE(heartbeat_stanza->NextNamed(signature_tag) == NULL);
 
-  HostKeyPair key_pair;
+  protocol::KeyPair key_pair;
   key_pair.LoadFromString(kTestHostKeyPair);
   std::string expected_signature =
       key_pair.GetSignature(std::string(kTestJid) + ' ' + expectedSequenceId);