Move HostKeyPair into protocol::KeyPair.

remoting/protocol/authenticator_test_base.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/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"
 
 using testing::_;
 using testing::SaveArg;
 
 namespace remoting {
 namespace protocol {
 
 namespace {
@@ skipping 17 matching lines @@
 
 void AuthenticatorTestBase::SetUp() {
   base::FilePath certs_dir(net::GetTestCertsDirectory());
 
   base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der");
   ASSERT_TRUE(file_util::ReadFileToString(cert_path, &host_cert_));
 
   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() {
   do {
     scoped_ptr<buzz::XmlElement> message;
 
     // Pass message from client to host.
     ASSERT_EQ(Authenticator::MESSAGE_READY, client_->state());
     message = client_->GetNextMessage();
     ASSERT_TRUE(message.get());
@@ skipping 77 matching lines @@
 
 void AuthenticatorTestBase::OnClientConnected(
     net::Error error,
     scoped_ptr<net::StreamSocket> socket) {
   client_callback_.OnDone(error);
   client_socket_ = socket.Pass();
 }
 
 }  // namespace protocol
 }  // namespace remoting