Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

remoting/protocol/third_party_client_authenticator.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_THIRD_PARTY_CLIENT_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_THIRD_PARTY_CLIENT_AUTHENTICATOR_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 37 matching lines @@
     // "hostjid:abc@example.com/123 clientjid:def@example.org/456".
     // |token_fetched_callback| is called when the client authentication ends,
     // in the same thread |FetchThirdPartyToken| was originally called.
     // The request is canceled if the TokenFetcher is destroyed.
     virtual void FetchThirdPartyToken(
         const GURL& token_url,
         const std::string& scope,
         const TokenFetchedCallback& token_fetched_callback) = 0;
   };
 
-  // Creates a third-party client authenticator for the host with the given
-  // |host_public_key|. |token_fetcher| is used to get the authentication token.
-  explicit ThirdPartyClientAuthenticator(
+  // Creates a third-party client authenticator.
+  // |create_base_authenticator_callback| is used to create the base
+  // authenticator. |token_fetcher| is used to get the authentication token.
+  ThirdPartyClientAuthenticator(
+      const CreateBaseAuthenticatorCallback& create_base_authenticator_callback,
       scoped_ptr<TokenFetcher> token_fetcher);
   ~ThirdPartyClientAuthenticator() override;
 
  protected:
   // ThirdPartyAuthenticator implementation.
   void ProcessTokenMessage(const buzz::XmlElement* message,
                            const base::Closure& resume_callback) override;
   void AddTokenElements(buzz::XmlElement* message) override;
 
  private:
   void OnThirdPartyTokenFetched(const base::Closure& resume_callback,
                                 const std::string& third_party_token,
                                 const std::string& shared_secret);
 
+  CreateBaseAuthenticatorCallback create_base_authenticator_callback_;
+  scoped_ptr<TokenFetcher> token_fetcher_;
   std::string token_;
-  scoped_ptr<TokenFetcher> token_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ThirdPartyClientAuthenticator);
 };
 
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_THIRD_PARTY_CLIENT_AUTHENTICATOR_H_