Refactor TokenValidatorImpl into a base class + implementation.

remoting/protocol/third_party_authenticator_unittest.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 "base/bind.h"
 #include "net/base/net_errors.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/authenticator_test_base.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/connection_tester.h"
 #include "remoting/protocol/fake_authenticator.h"
 #include "remoting/protocol/third_party_authenticator_base.h"
 #include "remoting/protocol/third_party_client_authenticator.h"
 #include "remoting/protocol/third_party_host_authenticator.h"
+#include "remoting/protocol/token_validator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using testing::_;
 using testing::DeleteArg;
 using testing::SaveArg;
 
 namespace {
 
@@ skipping 29 matching lines @@
       ASSERT_FALSE(on_token_fetched_.is_null());
       TokenFetchedCallback on_token_fetched = on_token_fetched_;
       on_token_fetched_.Reset();
       on_token_fetched.Run(token, shared_secret);
     }
 
    private:
     TokenFetchedCallback on_token_fetched_;
   };
 
-  class FakeTokenValidator
-      : public ThirdPartyHostAuthenticator::TokenValidator {
+  class FakeTokenValidator : public TokenValidator {
    public:
     FakeTokenValidator()
      : token_url_(kTokenUrl),
        token_scope_(kTokenScope) {}
 
     virtual ~FakeTokenValidator() {}
 
     virtual void ValidateThirdPartyToken(
         const std::string& token,
         const TokenValidatedCallback& token_validated_callback) OVERRIDE {
@@ skipping 21 matching lines @@
     std::string token_scope_;
     base::Callback<void(const std::string& shared_secret)> on_token_validated_;
   };
 
  public:
   ThirdPartyAuthenticatorTest() {}
   virtual ~ThirdPartyAuthenticatorTest() {}
 
  protected:
   void InitAuthenticators() {
-    scoped_ptr<ThirdPartyHostAuthenticator::TokenValidator>
-        token_validator(new FakeTokenValidator());
+    scoped_ptr<TokenValidator> token_validator(new FakeTokenValidator());
     token_validator_ = static_cast<FakeTokenValidator*>(token_validator.get());
     host_.reset(new ThirdPartyHostAuthenticator(
         host_cert_, key_pair_, token_validator.Pass()));
     scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher>
         token_fetcher(new FakeTokenFetcher());
     token_fetcher_ = static_cast<FakeTokenFetcher*>(token_fetcher.get());
     client_.reset(new ThirdPartyClientAuthenticator(token_fetcher.Pass()));
   }
 
   FakeTokenFetcher* token_fetcher_;
@@ skipping 98 matching lines @@
   ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state());
   ASSERT_NO_FATAL_FAILURE(
       token_validator_->OnTokenValidated(kSharedSecret));
 
   // The end result is that the host rejected the fake authentication.
   ASSERT_EQ(Authenticator::REJECTED, client_->state());
 }
 
 }  // namespace protocol
 }  // namespace remoting