Changes to PairingRegistry to facilitate per-platform implementions.

remoting/protocol/negotiating_authenticator_unittest.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 "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"
@@ skipping 13 matching lines @@
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 const int kMessageSize = 100;
 const int kMessages = 1;
 
 const char kNoClientId[] = "";
 const char kNoPairedSecret[] = "";
+const char kTestClientName[] = "client-name";
 const char kTestClientId[] = "client-id";
 const char kTestHostId[] = "12345678910123456";
 
 const char kTestPairedSecret[] = "1111-2222-3333";
 const char kTestPairedSecretBad[] = "4444-5555-6666";
 const char kTestPin[] = "123456";
 const char kTestPinBad[] = "654321";
 
 }  // namespace
 
@@ skipping 34 matching lines @@
     client_as_negotiating_authenticator_ = new NegotiatingClientAuthenticator(
         client_id, client_paired_secret,
         kTestHostId, fetch_secret_callback,
         scoped_ptr<ThirdPartyClientAuthenticator::TokenFetcher>(), methods);
     client_.reset(client_as_negotiating_authenticator_);
   }
 
   void CreatePairingRegistry(bool with_paired_client) {
     mock_delegate_ = new MockPairingRegistryDelegate;
     if (with_paired_client) {
-      PairingRegistry::Pairing pairing;
-      pairing.client_id = kTestClientId;
-      pairing.shared_secret = kTestPairedSecret;
-      mock_delegate_->AddPairing(pairing);
+      PairingRegistry::Pairing pairing(
+          base::Time(), kTestClientName, kTestClientId, kTestPairedSecret);
+      mock_delegate_->AddPairing(pairing,
+                                 PairingRegistry::AddPairingCallback());
     }
     pairing_registry_ = new PairingRegistry(
         scoped_ptr<PairingRegistry::Delegate>(mock_delegate_));
   }
 
   static void FetchSecret(
       const std::string& client_secret,
       bool pairing_supported,
       bool pairing_expected,
       const protocol::SecretFetchedCallback& secret_fetched_callback) {
@@ skipping 153 matching lines @@
   ASSERT_NO_FATAL_FAILURE(InitAuthenticators(
       kTestClientId, kTestPairedSecretBad, kTestPinBad, kTestPin,
       AuthenticationMethod::HMAC_SHA256, false));
   ASSERT_NO_FATAL_FAILURE(RunAuthExchange());
   mock_delegate_->RunCallback();
   VerifyRejected(Authenticator::INVALID_CREDENTIALS);
 }
 
 }  // namespace protocol
 }  // namespace remoting