Revert of Move NegotiatingClientAuthentication creation to ChromotingClient.

remoting/protocol/negotiating_client_authenticator.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_NEGOTIATING_CLIENT_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_NEGOTIATING_CLIENT_AUTHENTICATOR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/negotiating_authenticator_base.h"
 #include "remoting/protocol/third_party_client_authenticator.h"
 
 namespace remoting {
 namespace protocol {
 
-struct ClientAuthenticationConfig {
-  ClientAuthenticationConfig();
-  ~ClientAuthenticationConfig();
-
-  // Used for all authenticators.
-  std::string host_id;
-
-  // Used for pairing authenticators
-  std::string pairing_client_id;
-  std::string pairing_secret;
-
-  // Used for shared secret authenticators.
-  FetchSecretCallback fetch_secret_callback;
-
-  // Used for third party authenticators.
-  FetchThirdPartyTokenCallback fetch_third_party_token_callback;
-};
-
 // Client-side implementation of NegotiatingAuthenticatorBase.
 // See comments in negotiating_authenticator_base.h for a general explanation.
 class NegotiatingClientAuthenticator : public NegotiatingAuthenticatorBase {
  public:
-  explicit NegotiatingClientAuthenticator(
-      const ClientAuthenticationConfig& config);
+  // TODO(jamiewalch): Pass ClientConfig instead of separate parameters.
+  NegotiatingClientAuthenticator(
+      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);
+
   ~NegotiatingClientAuthenticator() override;
 
   // Overriden from Authenticator.
   void ProcessMessage(const buzz::XmlElement* message,
                       const base::Closure& resume_callback) override;
   scoped_ptr<buzz::XmlElement> GetNextMessage() override;
 
  private:
   // (Asynchronously) creates an authenticator, and stores it in
   // |current_authenticator_|. Authenticators that can be started in either
@@ skipping 14 matching lines @@
   // message.
   void CreatePreferredAuthenticator();
 
   // Creates a V2Authenticator in state |initial_state| with the given
   // |shared_secret|, then runs |resume_callback|.
   void CreateV2AuthenticatorWithSecret(
       Authenticator::State initial_state,
       const base::Closure& resume_callback,
       const std::string& shared_secret);
 
-  ClientAuthenticationConfig config_;
+  // Used for pairing authenticators
+  std::string client_pairing_id_;
+  std::string shared_secret_;
+
+  // Used for all authenticators.
+  std::string authentication_tag_;
+
+  // Used for shared secret authenticators.
+  FetchSecretCallback fetch_secret_callback_;
+
+  // Used for third party authenticators.
+  FetchThirdPartyTokenCallback fetch_third_party_token_callback_;
 
   // Internal NegotiatingClientAuthenticator data.
   bool method_set_by_host_ = false;
   base::WeakPtrFactory<NegotiatingClientAuthenticator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NegotiatingClientAuthenticator);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_NEGOTIATING_CLIENT_AUTHENTICATOR_H_