Move HostKeyPair into protocol::KeyPair.

remoting/protocol/ssl_hmac_channel_authenticator.h

Index: remoting/protocol/ssl_hmac_channel_authenticator.h
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.h b/remoting/protocol/ssl_hmac_channel_authenticator.h
index 3ba6492b0f2ba7b2e76131442448033a64e68a20..e118dd63099d758ec6f5b40e973318a058dc86c5 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator.h
+++ b/remoting/protocol/ssl_hmac_channel_authenticator.h
@@ -13,10 +13,6 @@
 #include "base/threading/non_thread_safe.h"
 #include "remoting/protocol/channel_authenticator.h"
 
-namespace crypto {
-class RSAPrivateKey;
-}  // namespace crypto
-
 namespace net {
 class CertVerifier;
 class DrainableIOBuffer;
@@ -27,6 +23,8 @@ class SSLSocket;
 namespace remoting {
 namespace protocol {
 
+class KeyPair;
+
 // SslHmacChannelAuthenticator implements ChannelAuthenticator that
 // secures channels using SSL and authenticates them with a shared
 // secret HMAC.
@@ -51,7 +49,7 @@ class SslHmacChannelAuthenticator : public ChannelAuthenticator,
 
   static scoped_ptr<SslHmacChannelAuthenticator> CreateForHost(
       const std::string& local_cert,
-      crypto::RSAPrivateKey* local_private_key,
+      scoped_ptr<KeyPair> key_pair,
       const std::string& auth_key);
 
   virtual ~SslHmacChannelAuthenticator();
@@ -85,7 +83,7 @@ class SslHmacChannelAuthenticator : public ChannelAuthenticator,
 
   // Used in the SERVER mode only.
   std::string local_cert_;
-  crypto::RSAPrivateKey* local_private_key_;
+  scoped_ptr<KeyPair> key_pair_;
 
   // Used in the CLIENT mode only.
   std::string remote_cert_;