Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: remoting/host/register_support_host_request_unittest.cc

Issue 12316083: Move HostKeyPair into protocol::KeyPair. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move HostKeyPair into protocol::KeyPair Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..21a31a8862d77ae41d370aaf625b69af87672322 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 "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
@@ -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,7 +118,7 @@ TEST_F(RegisterSupportHostRequestTest, Send) {
EXPECT_LE(start_time, time);
EXPECT_GE(now, time);
- HostKeyPair key_pair;
+ protocol::KeyPair key_pair;
key_pair.LoadFromString(kTestHostKeyPair);
std::string expected_signature =
key_pair.GetSignature(std::string(kTestJid) + ' ' + time_str);

Powered by Google App Engine
This is Rietveld 408576698