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 61b471b559053aee70e74a1b2e5ddf534cb4001e..7be0ff4d486a8ce3deca3d368d1ca211e8800dd3 100644
--- a/remoting/protocol/negotiating_authenticator.h
+++ b/remoting/protocol/negotiating_authenticator.h
@@ -9,15 +9,15 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/authentication_method.h"
 
-namespace crypto {
-class RSAPrivateKey;
-}  // namespace crypto
-
 namespace remoting {
+
+class RsaKeyPair;
+
 namespace protocol {
 
 class NegotiatingAuthenticator : public Authenticator {
@@ -26,14 +26,16 @@ class NegotiatingAuthenticator : public Authenticator {
 
   static bool IsNegotiableMessage(const buzz::XmlElement* message);
 
+  // Creates a client authenticator for the given methods.
   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_refptr<RsaKeyPair> key_pair,
       const std::string& shared_secret_hash,
       AuthenticationMethod::HashFunction hash_function);
 
@@ -57,12 +59,10 @@ class NegotiatingAuthenticator : public Authenticator {
 
   // Used only for host authenticators.
   std::string local_cert_;
-  scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
-  bool certificate_sent_;
+  scoped_refptr<RsaKeyPair> key_pair_;

[Sergey Ulanov, 2013/03/06 20:51:34]

local_key_pair_ please

[rmsousa, 2013/03/07 03:27:44]

Done.

   std::string shared_secret_hash_;
 
   // Used only for client authenticators.
-  std::string remote_cert_;
   std::string authentication_tag_;
   std::string shared_secret_;