Move HostKeyPair into protocol::KeyPair.

remoting/host/heartbeat_sender_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/host/heartbeat_sender.h"
 
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #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 "remoting/protocol/test_key_pair.h"

[Sergey Ulanov, 2013/02/26 00:14:13]

Looks like you forgot to add this file in the CL.

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

Done.

 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 #include "third_party/libjingle/source/talk/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
 
 using testing::_;
 using testing::DeleteArg;
@@ skipping 23 matching lines @@
 class HeartbeatSenderTest
     : public testing::Test,
       public HeartbeatSender::Listener {
  protected:
   // Overridden from HeartbeatSender::Listener
   virtual void OnUnknownHostIdError() OVERRIDE {
     NOTREACHED();
   }
 
   virtual void SetUp() OVERRIDE {
-    ASSERT_TRUE(key_pair_.LoadFromString(kTestHostKeyPair));
+    ASSERT_TRUE(key_pair_.LoadFromString(protocol::kTestHostKeyPair));
 
     EXPECT_CALL(signal_strategy_, GetState())
         .WillOnce(Return(SignalStrategy::DISCONNECTED));
     EXPECT_CALL(signal_strategy_, AddListener(NotNull()))
         .WillRepeatedly(AddListener(&signal_strategy_listeners_));
     EXPECT_CALL(signal_strategy_, RemoveListener(NotNull()))
         .WillRepeatedly(RemoveListener(&signal_strategy_listeners_));
     EXPECT_CALL(signal_strategy_, GetLocalJid())
         .WillRepeatedly(Return(kTestJid));
 
     heartbeat_sender_.reset(new HeartbeatSender(
         this, kHostId, &signal_strategy_, &key_pair_, kTestBotJid));
   }
 
   virtual void TearDown() OVERRIDE {
     heartbeat_sender_.reset();
     EXPECT_TRUE(signal_strategy_listeners_.empty());
   }
 
   void ValidateHeartbeatStanza(XmlElement* stanza,
                                const char* expectedSequenceId);
 
   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_;
 };
 
 // Call Start() followed by Stop(), and make sure a valid heartbeat is sent.
 TEST_F(HeartbeatSenderTest, DoSendStanza) {
   XmlElement* sent_iq = NULL;
   EXPECT_CALL(signal_strategy_, GetLocalJid())
       .WillRepeatedly(Return(kTestJid));
   EXPECT_CALL(signal_strategy_, GetNextId())
       .WillOnce(Return(kStanzaId));
@@ skipping 131 matching lines @@
   EXPECT_EQ(expectedSequenceId, heartbeat_stanza->Attr(
       buzz::QName(kChromotingXmlNamespace, "sequence-id")));
   EXPECT_EQ(std::string(kHostId),
             heartbeat_stanza->Attr(QName(kChromotingXmlNamespace, "hostid")));
 
   QName signature_tag(kChromotingXmlNamespace, "signature");
   XmlElement* signature = heartbeat_stanza->FirstNamed(signature_tag);
   ASSERT_TRUE(signature != NULL);
   EXPECT_TRUE(heartbeat_stanza->NextNamed(signature_tag) == NULL);
 
-  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) + ' ' + expectedSequenceId);
   EXPECT_EQ(expected_signature, signature->BodyText());
 }
 
 }  // namespace remoting