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..1e3f5409adb8578fef452286738897556548bb07 100644
--- a/remoting/protocol/authenticator_test_base.cc
+++ b/remoting/protocol/authenticator_test_base.cc
@@ -4,13 +4,14 @@
 
 #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/base/rsa_key_pair.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/fake_session.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);

[Wez, 2013/03/06 00:43:25]

Can we switch to a Base64 encoded string in the file, and avoid the need for
converting here?

[rmsousa, 2013/03/06 04:36:49]

These files are not owned by us, they're the test certificates for the entirety
of Chromium (they're in net/data/ssl/certificates).

More importantly, the certificate/key format we use, although straightforward,
isn't really a standard for certificate storage - the standards are either
binary DER or PEM (which is base64-encoded DER with some ---- BEGIN PUBLIC KEY
----- style dividers and line breaks).

Using base64-encoded DER without the PEM dividers is the most convenient format
for us (it allows us to handle it as text in Jingle/Javascript/HTTP without
wasting space with PEM headers), but that does put the onus on us to convert it 
to/from the standard formats when needed.

+  key_pair_ = new RsaKeyPair();
+  key_pair_->LoadFromString(key_base64);
 }
 
 void AuthenticatorTestBase::RunAuthExchange() {