Revert of Move NegotiatingClientAuthentication creation to ChromotingClient.

remoting/client/chromoting_client.h

 // 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.
 
 // ChromotingClient is the controller for the Client implementation.
 
 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/input_stub.h"
-#include "remoting/protocol/negotiating_client_authenticator.h"
 #include "remoting/protocol/performance_tracker.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/signaling/signal_strategy.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
@@ skipping 27 matching lines @@
 
   void set_protocol_config(scoped_ptr<protocol::CandidateSessionConfig> config);
 
   // Used to set fake/mock objects for tests which use the ChromotingClient.
   void SetConnectionToHostForTests(
       scoped_ptr<protocol::ConnectionToHost> connection_to_host);
 
   // Start the client. Must be called on the main thread. |signal_strategy|
   // must outlive the client.
   void Start(SignalStrategy* signal_strategy,
-             const protocol::ClientAuthenticationConfig& client_auth_config,
+             scoped_ptr<protocol::Authenticator> authenticator,
              scoped_refptr<protocol::TransportContext> transport_context,
              const std::string& host_jid,
              const std::string& capabilities);
 
   protocol::ConnectionToHost::State connection_state() const {
     return connection_->state();
   }
 
   protocol::ClipboardStub* clipboard_forwarder() {
     return connection_->clipboard_forwarder();
@@ skipping 37 matching lines @@
   base::ThreadChecker thread_checker_;
 
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config_;
 
   // The following are not owned by this class.
   ClientUserInterface* user_interface_ = nullptr;
   protocol::VideoRenderer* video_renderer_ = nullptr;
   SignalStrategy* signal_strategy_ = nullptr;
 
   std::string host_jid_;
-  protocol::ClientAuthenticationConfig client_auth_config_;
+  scoped_ptr<protocol::Authenticator> authenticator_;
   scoped_refptr<protocol::TransportContext> transport_context_;
 
   scoped_ptr<protocol::SessionManager> session_manager_;
   scoped_ptr<protocol::ConnectionToHost> connection_;
 
   scoped_ptr<AudioDecodeScheduler> audio_decode_scheduler_;
 
   std::string local_capabilities_;
 
   // The set of all capabilities supported by the host.
   std::string host_capabilities_;
 
   // True if |protocol::Capabilities| message has been received.
   bool host_capabilities_received_ = false;
 
   // Record the statistics of the connection.
   protocol::PerformanceTracker perf_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_H_