Revert of Move NegotiatingClientAuthentication creation to ChromotingClient.

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/v2_authenticator.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
-ClientAuthenticationConfig::ClientAuthenticationConfig() {}
-ClientAuthenticationConfig::~ClientAuthenticationConfig() {}
-
 NegotiatingClientAuthenticator::NegotiatingClientAuthenticator(
-    const ClientAuthenticationConfig& config)
+    const std::string& client_pairing_id,
+    const std::string& shared_secret,
+    const std::string& authentication_tag,
+    const FetchSecretCallback& fetch_secret_callback,
+    const FetchThirdPartyTokenCallback& fetch_third_party_token_callback)
     : NegotiatingAuthenticatorBase(MESSAGE_READY),
-      config_(config),
+      client_pairing_id_(client_pairing_id),
+      shared_secret_(shared_secret),
+      authentication_tag_(authentication_tag),
+      fetch_secret_callback_(fetch_secret_callback),
+      fetch_third_party_token_callback_(fetch_third_party_token_callback),
       weak_factory_(this) {
-  if (!config_.fetch_third_party_token_callback.is_null())
+  if (!fetch_third_party_token_callback.is_null())
     AddMethod(Method::THIRD_PARTY);
   AddMethod(Method::SPAKE2_PAIR);
   AddMethod(Method::SPAKE2_SHARED_SECRET_HMAC);
   AddMethod(Method::SPAKE2_SHARED_SECRET_PLAIN);
 }
 
 NegotiatingClientAuthenticator::~NegotiatingClientAuthenticator() {}
 
 void NegotiatingClientAuthenticator::ProcessMessage(
     const buzz::XmlElement* message,
@@ skipping 60 matching lines @@
   return GetNextMessageInternal();
 }
 
 void NegotiatingClientAuthenticator::CreateAuthenticatorForCurrentMethod(
     Authenticator::State preferred_initial_state,
     const base::Closure& resume_callback) {
   DCHECK(current_method_ != Method::INVALID);
   if (current_method_ == Method::THIRD_PARTY) {
     current_authenticator_.reset(new ThirdPartyClientAuthenticator(
         base::Bind(&V2Authenticator::CreateForClient),
-        config_.fetch_third_party_token_callback));
+        fetch_third_party_token_callback_));
     resume_callback.Run();
   } else {
     DCHECK(current_method_ == Method::SPAKE2_SHARED_SECRET_PLAIN ||
            current_method_ == Method::SPAKE2_PAIR ||
            current_method_ == Method::SPAKE2_SHARED_SECRET_HMAC);
     bool pairing_supported = (current_method_ == Method::SPAKE2_PAIR);
     SecretFetchedCallback callback = base::Bind(
         &NegotiatingClientAuthenticator::CreateV2AuthenticatorWithSecret,
         weak_factory_.GetWeakPtr(), preferred_initial_state, resume_callback);
-    config_.fetch_secret_callback.Run(pairing_supported, callback);
+    fetch_secret_callback_.Run(pairing_supported, callback);
   }
 }
 
 void NegotiatingClientAuthenticator::CreatePreferredAuthenticator() {
-  if (!config_.pairing_client_id.empty() && !config_.pairing_secret.empty() &&
+  if (!client_pairing_id_.empty() && !shared_secret_.empty() &&
       std::find(methods_.begin(), methods_.end(), Method::SPAKE2_PAIR) !=
           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));
+        client_pairing_id_, shared_secret_,
+        base::Bind(&V2Authenticator::CreateForClient), fetch_secret_callback_,
+        authentication_tag_));
     current_method_ = Method::SPAKE2_PAIR;
   }
 }
 
 void NegotiatingClientAuthenticator::CreateV2AuthenticatorWithSecret(
     Authenticator::State initial_state,
     const base::Closure& resume_callback,
     const std::string& shared_secret) {
   current_authenticator_ = V2Authenticator::CreateForClient(
       (current_method_ == Method::SPAKE2_SHARED_SECRET_PLAIN)
           ? shared_secret
-          : GetSharedSecretHash(config_.host_id, shared_secret),
+          : GetSharedSecretHash(authentication_tag_, shared_secret),
       initial_state);
   resume_callback.Run();
 }
 
 }  // namespace protocol
 }  // namespace remoting