Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/negotiating_client_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/negotiating_client_authenticator.h"
 
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
@@ skipping 24 matching lines @@
       token_fetcher_(std::move(token_fetcher)),
       method_set_by_host_(false),
       weak_factory_(this) {
   DCHECK(!methods.empty());
   for (std::vector<AuthenticationMethod>::const_iterator it = methods.begin();
        it != methods.end(); ++it) {
     AddMethod(*it);
   }
 }
 
-NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() {
-}
+NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() {}
 
 void NegotiatingClientAuthenticator::ProcessMessage(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback) {
   DCHECK_EQ(state(), WAITING_MESSAGE);
 
   std::string method_attr = message->Attr(kMethodAttributeQName);
   AuthenticationMethod method = ParseAuthenticationMethodString(method_attr);
 
   // The host picked a method different from the one the client had selected.
@@ skipping 56 matching lines @@
 void NegotiatingClientAuthenticator::CreateAuthenticatorForCurrentMethod(
     Authenticator::State preferred_initial_state,
     const base::Closure& resume_callback) {
   DCHECK(current_method_ != AuthenticationMethod::INVALID);
   if (current_method_ == AuthenticationMethod::THIRD_PARTY) {
     // |ThirdPartyClientAuthenticator| takes ownership of |token_fetcher_|.
     // The authentication method negotiation logic should guarantee that only
     // one |ThirdPartyClientAuthenticator| will need to be created per session.
     DCHECK(token_fetcher_);
     current_authenticator_.reset(new ThirdPartyClientAuthenticator(
+        base::Bind(&V2Authenticator::CreateForClient),
         std::move(token_fetcher_)));
     resume_callback.Run();
   } else {
     DCHECK(current_method_ ==
                AuthenticationMethod::SPAKE2_SHARED_SECRET_PLAIN ||
            current_method_ == AuthenticationMethod::SPAKE2_SHARED_SECRET_HMAC ||
            current_method_ == AuthenticationMethod::SPAKE2_PAIR);
     bool pairing_supported =
         (current_method_ == AuthenticationMethod::SPAKE2_PAIR);
     SecretFetchedCallback callback = base::Bind(
         &NegotiatingClientAuthenticator::CreateV2AuthenticatorWithSecret,
         weak_factory_.GetWeakPtr(), preferred_initial_state, resume_callback);
     fetch_secret_callback_.Run(pairing_supported, callback);
   }
 }
 
 void NegotiatingClientAuthenticator::CreatePreferredAuthenticator() {
   if (!client_pairing_id_.empty() && !shared_secret_.empty() &&
       std::find(methods_.begin(), methods_.end(),
                 AuthenticationMethod::SPAKE2_PAIR) != methods_.end()) {
     // If the client specified a pairing id and shared secret, then create a
     // PairingAuthenticator.
     current_authenticator_.reset(new PairingClientAuthenticator(
-        client_pairing_id_, shared_secret_, fetch_secret_callback_,
+        client_pairing_id_, shared_secret_,
+        base::Bind(&V2Authenticator::CreateForClient), fetch_secret_callback_,
         authentication_tag_));
     current_method_ = AuthenticationMethod::SPAKE2_PAIR;
   }
 }
 
 void NegotiatingClientAuthenticator::CreateV2AuthenticatorWithSecret(
     Authenticator::State initial_state,
     const base::Closure& resume_callback,
     const std::string& shared_secret) {
   current_authenticator_ = V2Authenticator::CreateForClient(
       ApplySharedSecretHashFunction(
           GetHashFunctionForAuthenticationMethod(current_method_),
           authentication_tag_, shared_secret),
       initial_state);
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting