Revert 139424 - Remove V1 authenticators.

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 "base/bind.h"
 #include "remoting/client/chromoting_view.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/rectangle_update_decoder.h"
 #include "remoting/protocol/authentication_method.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/negotiating_authenticator.h"
+#include "remoting/protocol/v1_authenticator.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/transport.h"
 
 namespace remoting {
 
 using protocol::AuthenticationMethod;
 
 ChromotingClient::QueuedVideoPacket::QueuedVideoPacket(
     scoped_ptr<VideoPacket> packet, const base::Closure& done)
     : packet(packet.release()), done(done) {
@@ skipping 21 matching lines @@
 
 ChromotingClient::~ChromotingClient() {
 }
 
 void ChromotingClient::Start(
     scoped_refptr<XmppProxy> xmpp_proxy,
     scoped_ptr<protocol::TransportFactory> transport_factory) {
   DCHECK(message_loop()->BelongsToCurrentThread());
 
   scoped_ptr<protocol::Authenticator> authenticator;
-  authenticator = protocol::NegotiatingAuthenticator::CreateForClient(
-      config_.authentication_tag,
-      config_.shared_secret, config_.authentication_methods);
+  if (config_.use_v1_authenticator) {
+    authenticator.reset(new protocol::V1ClientAuthenticator(
+        config_.local_jid, config_.shared_secret));
+  } else {
+    authenticator = protocol::NegotiatingAuthenticator::CreateForClient(
+        config_.authentication_tag,
+        config_.shared_secret, config_.authentication_methods);
+  }
 
   connection_->Connect(xmpp_proxy, config_.local_jid, config_.host_jid,
                        config_.host_public_key, transport_factory.Pass(),
                        authenticator.Pass(), this, this, this, this);
 
   if (!view_->Initialize()) {
     ClientDone();
   }
 }
 
@@ skipping 145 matching lines @@
     thread_proxy_.PostTask(FROM_HERE, base::Bind(
         &ChromotingClient::Initialize, base::Unretained(this)));
     return;
   }
 
   // Initialize the decoder.
   rectangle_decoder_->Initialize(connection_->config());
 }
 
 }  // namespace remoting