Move HostKeyPair into protocol::KeyPair.

remoting/protocol/negotiating_authenticator.h

Index: remoting/protocol/negotiating_authenticator.h
diff --git a/remoting/protocol/negotiating_authenticator.h b/remoting/protocol/negotiating_authenticator.h
index aabbf8827e21f675b99a1e05088b3f7b90dc5867..17d89eb35d334e429ff7b2261fc43ca1db8a3ebf 100644
--- a/remoting/protocol/negotiating_authenticator.h
+++ b/remoting/protocol/negotiating_authenticator.h
@@ -13,27 +13,29 @@
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/authentication_method.h"
 
-namespace crypto {
-class RSAPrivateKey;
-}  // namespace crypto
-
 namespace remoting {
 namespace protocol {
 
+class KeyPair;
+
 class NegotiatingAuthenticator : public Authenticator {
  public:
   virtual ~NegotiatingAuthenticator();
 
   static bool IsNegotiableMessage(const buzz::XmlElement* message);
 
+  // Creates a client authenticator for the given methods.
+  // |third_party_token_fetcher| must be non-null if a ThirdPartyAuth method is
+  // requested, and must outlive this authenticator.
   static scoped_ptr<Authenticator> CreateForClient(
       const std::string& authentication_tag,
       const std::string& shared_secret,
       const std::vector<AuthenticationMethod>& methods);
 
+  // Creates a host authenticator, using a fixed shared secret/PIN hash.
   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_hash,
       AuthenticationMethod::HashFunction hash_function);
 
@@ -50,16 +52,15 @@ class NegotiatingAuthenticator : public Authenticator {
 
   void AddMethod(const AuthenticationMethod& method);
   void CreateAuthenticator(State initial_state);
+
   bool is_host_side() const;
 
   // Used only for host authenticators.
   std::string local_cert_;
-  scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
-  bool certificate_sent_;

[rmsousa, 2013/02/23 00:48:51]

Unused member variable
(likely stale, certificate is currently only used inside v2_authenticator)

+  scoped_ptr<KeyPair> key_pair_;
   std::string shared_secret_hash_;
 
   // Used only for client authenticators.
-  std::string remote_cert_;

[rmsousa, 2013/02/23 00:48:51]

Unused member variable

   std::string authentication_tag_;
   std::string shared_secret_;