Move HostKeyPair into protocol::KeyPair.

remoting/protocol/v2_authenticator.h

Index: remoting/protocol/v2_authenticator.h
diff --git a/remoting/protocol/v2_authenticator.h b/remoting/protocol/v2_authenticator.h
index ef6503c26c8b4fc15f9a980eecb184cd55eeb595..ddedb743fabedebf8ca1543c93afb5320c88e567 100644
--- a/remoting/protocol/v2_authenticator.h
+++ b/remoting/protocol/v2_authenticator.h
@@ -13,10 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "crypto/p224_spake.h"
 #include "remoting/protocol/authenticator.h"
-
-namespace crypto {
-class RSAPrivateKey;
-}  // namespace crypto
+#include "remoting/protocol/key_pair.h"
 
 namespace remoting {
 namespace protocol {
@@ -31,7 +28,7 @@ class V2Authenticator : public Authenticator {
 
   static scoped_ptr<Authenticator> CreateForHost(
       const std::string& local_cert,
-      const crypto::RSAPrivateKey& local_private_key,
+      scoped_ptr<KeyPair> key_pair,
       const std::string& shared_secret,
       State initial_state);
 
@@ -56,7 +53,7 @@ class V2Authenticator : public Authenticator {
 
   // Used only for host authenticators.
   std::string local_cert_;
-  scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
+  scoped_ptr<KeyPair> key_pair_;

[Sergey Ulanov, 2013/02/26 00:14:13]

Maybe call it local_key_pair_?

[rmsousa, 2013/02/26 02:38:52]

Done.

   bool certificate_sent_;
 
   // Used only for client authenticators.