Use ClientAuthenticationConfig in PairingClientAuthenticator

remoting/protocol/negotiating_client_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_client_authenticator.h"
 
 #include <algorithm>
 #include <sstream>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/pairing_client_authenticator.h"
 #include "remoting/protocol/spake2_authenticator.h"
 #include "remoting/protocol/v2_authenticator.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
-ClientAuthenticationConfig::ClientAuthenticationConfig() {}
-ClientAuthenticationConfig::~ClientAuthenticationConfig() {}
-
 NegotiatingClientAuthenticator::NegotiatingClientAuthenticator(
     const std::string& local_id,
     const std::string& remote_id,
     const ClientAuthenticationConfig& config)
     : NegotiatingAuthenticatorBase(MESSAGE_READY),
       local_id_(local_id),
       remote_id_(remote_id),
       config_(config),
       weak_factory_(this) {
   if (!config_.fetch_third_party_token_callback.is_null()) {
@@ skipping 106 matching lines @@
   }
 }
 
 void NegotiatingClientAuthenticator::CreatePreferredAuthenticator() {
   if (!config_.pairing_client_id.empty() && !config_.pairing_secret.empty() &&
       std::find(methods_.begin(), methods_.end(), Method::PAIRED_SPAKE2_P224) !=
           methods_.end()) {
     // If the client specified a pairing id and shared secret, then create a
     // PairingAuthenticator.
     current_authenticator_.reset(new PairingClientAuthenticator(
-        config_.pairing_client_id, config_.pairing_secret,
-        base::Bind(&V2Authenticator::CreateForClient),
-        config_.fetch_secret_callback, config_.host_id));
+        config_, base::Bind(&V2Authenticator::CreateForClient)));
     current_method_ = Method::PAIRED_SPAKE2_P224;
   }
 }
 
 void NegotiatingClientAuthenticator::CreateSharedSecretAuthenticator(
     Authenticator::State initial_state,
     const base::Closure& resume_callback,
     const std::string& shared_secret) {
   std::string shared_secret_hash =
       (current_method_ == Method::SHARED_SECRET_PLAIN_SPAKE2_P224)
           ? shared_secret
           : GetSharedSecretHash(config_.host_id, shared_secret);
 
   if (current_method_ == Method::SHARED_SECRET_SPAKE2_CURVE25519) {
     current_authenticator_ = Spake2Authenticator::CreateForClient(
         local_id_, remote_id_, shared_secret_hash, initial_state);
   } else {
     current_authenticator_ =
         V2Authenticator::CreateForClient(shared_secret_hash, initial_state);
   }
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting