Make TokenValidatorFactory ref-counted.

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 60 matching lines @@
   return std::move(result);
 }
 
 // static
 scoped_ptr<Authenticator>
 NegotiatingHostAuthenticator::CreateWithThirdPartyAuth(
     const std::string& local_id,
     const std::string& remote_id,
     const std::string& local_cert,
     scoped_refptr<RsaKeyPair> key_pair,
-    scoped_ptr<TokenValidator> token_validator) {
+    scoped_refptr<TokenValidatorFactory> token_validator_factory) {
   scoped_ptr<NegotiatingHostAuthenticator> result(
       new NegotiatingHostAuthenticator(local_id, remote_id, local_cert,
                                        key_pair));
-  result->token_validator_ = std::move(token_validator);
+  result->token_validator_factory_ = token_validator_factory;
   result->AddMethod(Method::THIRD_PARTY_SPAKE2_CURVE25519);
   result->AddMethod(Method::THIRD_PARTY_SPAKE2_P224);
   return std::move(result);
 }
 
 NegotiatingHostAuthenticator::~NegotiatingHostAuthenticator() {}
 
 void NegotiatingHostAuthenticator::ProcessMessage(
     const buzz::XmlElement* message,
     const base::Closure& resume_callback) {
@@ skipping 80 matching lines @@
 scoped_ptr<buzz::XmlElement> NegotiatingHostAuthenticator::GetNextMessage() {
   return GetNextMessageInternal();
 }
 
 void NegotiatingHostAuthenticator::CreateAuthenticator(
     Authenticator::State preferred_initial_state,
     const base::Closure& resume_callback) {
   DCHECK(current_method_ != Method::INVALID);
 
   if (current_method_ == Method::THIRD_PARTY_SPAKE2_P224) {
-    // |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(
         base::Bind(&V2Authenticator::CreateForHost, local_cert_,
                    local_key_pair_),
-        std::move(token_validator_)));
+        token_validator_factory_->CreateTokenValidator(local_id_, remote_id_)));
   } else if (current_method_ == Method::THIRD_PARTY_SPAKE2_CURVE25519) {
-    // |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(
         base::Bind(&Spake2Authenticator::CreateForHost, local_id_, remote_id_,
                    local_cert_, local_key_pair_),
-        std::move(token_validator_)));
+        token_validator_factory_->CreateTokenValidator(local_id_, remote_id_)));
   } else if (current_method_ == Method::SHARED_SECRET_SPAKE2_CURVE25519) {
     current_authenticator_ = Spake2Authenticator::CreateForHost(
         local_id_, remote_id_, local_cert_, local_key_pair_,
         shared_secret_hash_, preferred_initial_state);
   } else if (current_method_ == Method::PAIRED_SPAKE2_P224 &&
              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_, base::Bind(&V2Authenticator::CreateForHost,
@@ skipping 11 matching lines @@
            current_method_ == Method::PAIRED_SPAKE2_P224);
     current_authenticator_ = V2Authenticator::CreateForHost(
         local_cert_, local_key_pair_, shared_secret_hash_,
         preferred_initial_state);
   }
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting