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..f35c5a6f336c67518fe48df0a9dc5c88f28f2d13 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 "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" |
@@ -58,7 +58,7 @@ class HeartbeatSenderTest |
} |
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)); |
@@ -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,8 +236,8 @@ void HeartbeatSenderTest::ValidateHeartbeatStanza( |
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()); |