Revert of Move NegotiatingClientAuthentication creation to ChromotingClient.

remoting/client/chromoting_client.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 "remoting/client/chromoting_client.h"
 
 #include <utility>
 
 #include "remoting/base/capabilities.h"
 #include "remoting/client/audio_decode_scheduler.h"
@@ skipping 35 matching lines @@
   protocol_config_ = std::move(config);
 }
 
 void ChromotingClient::SetConnectionToHostForTests(
     scoped_ptr<protocol::ConnectionToHost> connection_to_host) {
   connection_ = std::move(connection_to_host);
 }
 
 void ChromotingClient::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) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!session_manager_);  // Start must be called more than once.
 
   host_jid_ = host_jid;
   local_capabilities_ = capabilities;
 
   if (!protocol_config_)
@@ skipping 15 matching lines @@
     }
   }
   connection_->set_client_stub(this);
   connection_->set_clipboard_stub(this);
   connection_->set_video_renderer(video_renderer_);
   connection_->set_audio_stub(audio_decode_scheduler_.get());
 
   session_manager_.reset(new protocol::JingleSessionManager(signal_strategy));
   session_manager_->set_protocol_config(std::move(protocol_config_));
 
-  client_auth_config_ = client_auth_config;
+  authenticator_ = std::move(authenticator);
   transport_context_ = transport_context;
 
   signal_strategy_ = signal_strategy;
   signal_strategy_->AddListener(this);
 
   switch (signal_strategy_->GetState()) {
     case SignalStrategy::CONNECTING:
       // Nothing to do here. Just need to wait until |signal_strategy_| becomes
       // connected.
       break;
@@ skipping 102 matching lines @@
 }
 
 bool ChromotingClient::OnSignalStrategyIncomingStanza(
     const buzz::XmlElement* stanza) {
   return false;
 }
 
 void ChromotingClient::StartConnection() {
   DCHECK(thread_checker_.CalledOnValidThread());
   connection_->Connect(
-      session_manager_->Connect(
-          host_jid_,
-          make_scoped_ptr(new protocol::NegotiatingClientAuthenticator(
-              client_auth_config_))),
+      session_manager_->Connect(host_jid_, std::move(authenticator_)),
       transport_context_, this);
 }
 
 void ChromotingClient::OnAuthenticated() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Initialize the decoder.
   if (connection_->config().is_audio_enabled())
     audio_decode_scheduler_->Initialize(connection_->config());
 }
 
 void ChromotingClient::OnChannelsConnected() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Negotiate capabilities with the host.
   VLOG(1) << "Client capabilities: " << local_capabilities_;
 
   protocol::Capabilities capabilities;
   capabilities.set_capabilities(local_capabilities_);
   connection_->host_stub()->SetCapabilities(capabilities);
 }
 
 }  // namespace remoting