Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/third_party_host_authenticator.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/third_party_host_authenticator.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "remoting/base/constants.h"
-#include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/token_validator.h"
-#include "remoting/protocol/v2_authenticator.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
 ThirdPartyHostAuthenticator::ThirdPartyHostAuthenticator(
-    const std::string& local_cert,
-    scoped_refptr<RsaKeyPair> key_pair,
+    const CreateBaseAuthenticatorCallback& create_base_authenticator_callback,
     scoped_ptr<TokenValidator> token_validator)
     : ThirdPartyAuthenticatorBase(MESSAGE_READY),
-      local_cert_(local_cert),
-      key_pair_(key_pair),
-      token_validator_(std::move(token_validator)) {
-}
+      create_base_authenticator_callback_(create_base_authenticator_callback),
+      token_validator_(std::move(token_validator)) {}
 
-ThirdPartyHostAuthenticator::~ThirdPartyHostAuthenticator() {
-}
+ThirdPartyHostAuthenticator::~ThirdPartyHostAuthenticator() {}
 
 void ThirdPartyHostAuthenticator::ProcessTokenMessage(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback) {
   // Host has already sent the URL and expects a token from the client.
   std::string token = message->TextNamed(kTokenTag);
   if (token.empty()) {
     LOG(ERROR) << "Third-party authentication protocol error: missing token.";
     token_state_ = REJECTED;
     rejection_reason_ = PROTOCOL_ERROR;
@@ skipping 37 matching lines @@
     const std::string& shared_secret) {
   if (shared_secret.empty()) {
     token_state_ = REJECTED;
     rejection_reason_ = INVALID_CREDENTIALS;
     resume_callback.Run();
     return;
   }
 
   // The other side already started the SPAKE authentication.
   token_state_ = ACCEPTED;
-  underlying_ = V2Authenticator::CreateForHost(
-      local_cert_, key_pair_, shared_secret, WAITING_MESSAGE);
+  underlying_ =
+      create_base_authenticator_callback_.Run(shared_secret, WAITING_MESSAGE);
   underlying_->ProcessMessage(message, resume_callback);
 }
 
 }  // namespace protocol
 }  // namespace remoting