Make TokenValidatorFactory ref-counted.

remoting/protocol/me2me_host_authenticator_factory.cc

 // Copyright (c) 2012 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/me2me_host_authenticator_factory.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/strings/string_util.h"
@@ skipping 30 matching lines @@
 }
 
 
 // static
 scoped_ptr<AuthenticatorFactory>
 Me2MeHostAuthenticatorFactory::CreateWithThirdPartyAuth(
     bool use_service_account,
     const std::string& host_owner,
     const std::string& local_cert,
     scoped_refptr<RsaKeyPair> key_pair,
-      const std::string& required_client_domain,
-    scoped_ptr<TokenValidatorFactory>
-        token_validator_factory) {
+    const std::string& required_client_domain,
+    scoped_refptr<TokenValidatorFactory> token_validator_factory) {
   scoped_ptr<Me2MeHostAuthenticatorFactory> result(
       new Me2MeHostAuthenticatorFactory());
   result->use_service_account_ = use_service_account;
   result->host_owner_ = host_owner;
   result->local_cert_ = local_cert;
   result->key_pair_ = key_pair;
   result->required_client_domain_ = required_client_domain;
-  result->token_validator_factory_ = std::move(token_validator_factory);
+  result->token_validator_factory_ = token_validator_factory;
   return std::move(result);
 }
 
 Me2MeHostAuthenticatorFactory::Me2MeHostAuthenticatorFactory() {}
 
 Me2MeHostAuthenticatorFactory::~Me2MeHostAuthenticatorFactory() {}
 
 scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
     const std::string& local_jid,
     const std::string& remote_jid) {
@@ skipping 41 matching lines @@
                  << ": Domain mismatch.";
       return make_scoped_ptr(
           new RejectingAuthenticator(Authenticator::INVALID_CREDENTIALS));
     }
   }
 
   if (!local_cert_.empty() && key_pair_.get()) {
     if (token_validator_factory_) {
       return NegotiatingHostAuthenticator::CreateWithThirdPartyAuth(
           local_jid, remote_jid, local_cert_, key_pair_,
-          token_validator_factory_->CreateTokenValidator(local_jid,
-                                                         remote_jid));
+          token_validator_factory_);
     }
 
     return NegotiatingHostAuthenticator::CreateWithPin(
         local_jid, remote_jid, local_cert_, key_pair_, pin_hash_,
         pairing_registry_);
   }
 
   return make_scoped_ptr(
       new RejectingAuthenticator(Authenticator::INVALID_CREDENTIALS));
 }
 
 }  // namespace protocol
 }  // namespace remoting