Move HostKeyPair into protocol::KeyPair.

remoting/host/register_support_host_request_unittest.cc

Index: remoting/host/register_support_host_request_unittest.cc
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index 81b5c42a27fcdc9d5c04171b37ec1330bf347528..a1fda1fd96fc16919ae35714f0022d4556ed2684 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -10,11 +10,11 @@
 #include "base/observer_list.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
-#include "remoting/host/host_key_pair.h"
 #include "remoting/host/in_memory_host_config.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 "remoting/protocol/test_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"
@@ -58,7 +58,7 @@ class RegisterSupportHostRequestTest : public testing::Test {
  public:
  protected:
   virtual void SetUp() {
-    ASSERT_TRUE(key_pair_.LoadFromString(kTestHostKeyPair));
+    ASSERT_TRUE(key_pair_.LoadFromString(protocol::kTestHostKeyPair));
 
     EXPECT_CALL(signal_strategy_, AddListener(NotNull()))
         .WillRepeatedly(AddListener(&signal_strategy_listeners_));
@@ -71,7 +71,7 @@ class RegisterSupportHostRequestTest : public testing::Test {
   MessageLoop message_loop_;
   MockSignalStrategy signal_strategy_;
   ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
-  HostKeyPair key_pair_;
+  protocol::KeyPair key_pair_;
   MockCallback callback_;
 };
 
@@ -118,8 +118,8 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
   EXPECT_LE(start_time, time);
   EXPECT_GE(now, time);
 
-  HostKeyPair key_pair;
-  key_pair.LoadFromString(kTestHostKeyPair);
+  protocol::KeyPair key_pair;
+  key_pair.LoadFromString(protocol::kTestHostKeyPair);
   std::string expected_signature =
       key_pair.GetSignature(std::string(kTestJid) + ' ' + time_str);
   EXPECT_EQ(expected_signature, signature->BodyText());