Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/negotiating_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/negotiating_host_authenticator.h"
 
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
@@ skipping 157 matching lines @@
     Authenticator::State preferred_initial_state,
     const base::Closure& resume_callback) {
   DCHECK(current_method_ != AuthenticationMethod::INVALID);
 
   if (current_method_ == AuthenticationMethod::THIRD_PARTY) {
     // |ThirdPartyHostAuthenticator| takes ownership of |token_validator_|.
     // The authentication method negotiation logic should guarantee that only
     // one |ThirdPartyHostAuthenticator| will need to be created per session.
     DCHECK(token_validator_);
     current_authenticator_.reset(new ThirdPartyHostAuthenticator(
-        local_cert_, local_key_pair_, std::move(token_validator_)));
+        base::Bind(&V2Authenticator::CreateForHost, local_cert_,
+                   local_key_pair_),
+        std::move(token_validator_)));
   } else if (current_method_ == AuthenticationMethod::SPAKE2_PAIR &&
              preferred_initial_state == WAITING_MESSAGE) {
     // If the client requested Spake2Pair and sent an initial message, attempt
     // the paired connection protocol.
     current_authenticator_.reset(new PairingHostAuthenticator(
-        pairing_registry_, local_cert_, local_key_pair_, shared_secret_hash_));
+        pairing_registry_, base::Bind(&V2Authenticator::CreateForHost,
+                                      local_cert_, local_key_pair_),
+        shared_secret_hash_));
   } else {
     // In all other cases, use the V2 protocol. Note that this includes the
     // case where the protocol is Spake2Pair but the client is not yet paired.
     // In this case, the on-the-wire protocol is plain Spake2, advertised as
     // Spake2Pair so that the client knows that the host supports pairing and
     // that it can therefore present the option to the user when they enter
     // the PIN.
     DCHECK(current_method_ ==
                AuthenticationMethod::SPAKE2_SHARED_SECRET_PLAIN ||
            current_method_ == AuthenticationMethod::SPAKE2_SHARED_SECRET_HMAC ||
            current_method_ == AuthenticationMethod::SPAKE2_PAIR);
     current_authenticator_ = V2Authenticator::CreateForHost(
         local_cert_, local_key_pair_, shared_secret_hash_,
         preferred_initial_state);
   }
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting