Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/third_party_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/third_party_client_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/channel_authenticator.h"
-#include "remoting/protocol/v2_authenticator.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "url/gurl.h"
 
 namespace remoting {
 namespace protocol {
 
 ThirdPartyClientAuthenticator::ThirdPartyClientAuthenticator(
+    const CreateBaseAuthenticatorCallback& create_base_authenticator_callback,
     scoped_ptr<TokenFetcher> token_fetcher)
     : ThirdPartyAuthenticatorBase(WAITING_MESSAGE),
-      token_fetcher_(std::move(token_fetcher)) {
-}
+      create_base_authenticator_callback_(create_base_authenticator_callback),
+      token_fetcher_(std::move(token_fetcher)) {}
 
-ThirdPartyClientAuthenticator::~ThirdPartyClientAuthenticator() {
-}
+ThirdPartyClientAuthenticator::~ThirdPartyClientAuthenticator() {}
 
 void ThirdPartyClientAuthenticator::ProcessTokenMessage(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback) {
   std::string token_url = message->TextNamed(kTokenUrlTag);
   std::string token_scope = message->TextNamed(kTokenScopeTag);
 
   if (token_url.empty() || token_scope.empty()) {
     LOG(ERROR) << "Third-party authentication protocol error: "
         "missing token verification URL or scope.";
@@ skipping 26 matching lines @@
 void ThirdPartyClientAuthenticator::OnThirdPartyTokenFetched(
     const base::Closure& resume_callback,
     const std::string& third_party_token,
     const std::string& shared_secret) {
   token_ = third_party_token;
   if (token_.empty() || shared_secret.empty()) {
     token_state_ = REJECTED;
     rejection_reason_ = INVALID_CREDENTIALS;
   } else {
     token_state_ = MESSAGE_READY;
-    underlying_ = V2Authenticator::CreateForClient(
-        shared_secret, MESSAGE_READY);
+    underlying_ =
+        create_base_authenticator_callback_.Run(shared_secret, MESSAGE_READY);
   }
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting