Remove dependency on V2Authenticator from ThirdParty and pairing authenticators.

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 <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/macros.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 "remoting/protocol/v2_authenticator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 using testing::_;
 using testing::DeleteArg;
 using testing::SaveArg;
 
 namespace {
 
@@ skipping 63 matching lines @@
     std::string token_scope_;
     base::Callback<void(const std::string& shared_secret)> on_token_validated_;
   };
 
  public:
   ThirdPartyAuthenticatorTest() {}
   ~ThirdPartyAuthenticatorTest() override {}
 
  protected:
   void InitAuthenticators() {
-    scoped_ptr<TokenValidator> token_validator(new FakeTokenValidator());
-    token_validator_ = static_cast<FakeTokenValidator*>(token_validator.get());
+    token_validator_ = new FakeTokenValidator();
     host_.reset(new ThirdPartyHostAuthenticator(
-        host_cert_, key_pair_, std::move(token_validator)));
-    scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher>
-        token_fetcher(new FakeTokenFetcher());
-    token_fetcher_ = static_cast<FakeTokenFetcher*>(token_fetcher.get());
-    client_.reset(new ThirdPartyClientAuthenticator(std::move(token_fetcher)));
+        base::Bind(&V2Authenticator::CreateForHost, host_cert_, key_pair_),
+        make_scoped_ptr(token_validator_)));
+    token_fetcher_ = new FakeTokenFetcher();
+    client_.reset(new ThirdPartyClientAuthenticator(
+        base::Bind(&V2Authenticator::CreateForClient),
+        make_scoped_ptr(token_fetcher_)));
   }
 
   FakeTokenFetcher* token_fetcher_;
   FakeTokenValidator* token_validator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ThirdPartyAuthenticatorTest);
 };
 
 TEST_F(ThirdPartyAuthenticatorTest, SuccessfulAuth) {
@@ skipping 84 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