Move HostKeyPair into protocol::KeyPair.

remoting/protocol/authenticator_test_base.cc

Index: remoting/protocol/authenticator_test_base.cc
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc
index 18450987f3f0559e79f491eda89cd4a47491cfe1..02ea9c3bbece8f72c37d00b105f0c5f25e830b69 100644
--- a/remoting/protocol/authenticator_test_base.cc
+++ b/remoting/protocol/authenticator_test_base.cc
@@ -4,16 +4,17 @@
 
 #include "remoting/protocol/authenticator_test_base.h"
 
+#include "base/base64.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "base/timer.h"
-#include "crypto/rsa_private_key.h"
 #include "net/base/test_data_directory.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/fake_session.h"
+#include "remoting/protocol/key_pair.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
@@ -51,12 +52,10 @@ void AuthenticatorTestBase::SetUp() {
   base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
   std::string key_string;
   ASSERT_TRUE(file_util::ReadFileToString(key_path, &key_string));
-  std::vector<uint8> key_vector(
-      reinterpret_cast<const uint8*>(key_string.data()),
-      reinterpret_cast<const uint8*>(key_string.data() +
-                                     key_string.length()));
-  private_key_.reset(
-      crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
+  std::string key_base64;
+  base::Base64Encode(key_string, &key_base64);
+  key_pair_.reset(new KeyPair());
+  key_pair_->LoadFromString(key_base64);
 }
 
 void AuthenticatorTestBase::RunAuthExchange() {