Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/third_party_host_authenticator.h

Index: remoting/protocol/third_party_host_authenticator.h
diff --git a/remoting/protocol/third_party_host_authenticator.h b/remoting/protocol/third_party_host_authenticator.h
index ff2036afb3ecafc8c690f4eacff00644c460c931..f9755a9e02dd0a09e1ac31a4119a86a5f73733bf 100644
--- a/remoting/protocol/third_party_host_authenticator.h
+++ b/remoting/protocol/third_party_host_authenticator.h
@@ -13,9 +13,6 @@
 #include "remoting/protocol/third_party_authenticator_base.h"
 
 namespace remoting {
-
-class RsaKeyPair;
-
 namespace protocol {
 
 class TokenValidator;
@@ -26,16 +23,16 @@ class TokenValidator;
 // Once that token is received, it calls |TokenValidator| asynchronously to
 // validate it, and exchange it for a |shared_secret|. Once the |TokenValidator|
 // returns, the host uses the |shared_secret| to create an underlying
-// |V2Authenticator|, which is used to establish the encrypted connection.
+// SPAKE2 authenticator, which is used to establish the encrypted connection.
 class ThirdPartyHostAuthenticator : public ThirdPartyAuthenticatorBase {
  public:
-  // Creates a third-party host authenticator. |local_cert| and |key_pair| are
-  // used by the underlying V2Authenticator to create the SSL channels.
-  // |token_validator| contains the token parameters to be sent to the client
-  // and is used to obtain the shared secret.
-  ThirdPartyHostAuthenticator(const std::string& local_cert,
-                              scoped_refptr<RsaKeyPair> key_pair,
-                              scoped_ptr<TokenValidator> token_validator);
+  // Creates a third-party host authenticator.
+  // |create_base_authenticator_callback| is used to create the base
+  // authenticator. |token_validator| contains the token parameters to be sent
+  // to the client and is used to obtain the shared secret.
+  ThirdPartyHostAuthenticator(
+      const CreateBaseAuthenticatorCallback& create_base_authenticator_callback,
+      scoped_ptr<TokenValidator> token_validator);
   ~ThirdPartyHostAuthenticator() override;
 
  protected:
@@ -49,8 +46,7 @@ class ThirdPartyHostAuthenticator : public ThirdPartyAuthenticatorBase {
                                   const base::Closure& resume_callback,
                                   const std::string& shared_secret);
 
-  std::string local_cert_;
-  scoped_refptr<RsaKeyPair> key_pair_;
+  CreateBaseAuthenticatorCallback create_base_authenticator_callback_;
   scoped_ptr<TokenValidator> token_validator_;
 
   DISALLOW_COPY_AND_ASSIGN(ThirdPartyHostAuthenticator);