Index: remoting/client/chromoting_client.cc |
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc |
index 4dabdd2cf30fd663e12e7901b9a1c04a7d1365f3..9edb480a61d07bfaad26c0568e885dd670d6192f 100644 |
--- a/remoting/client/chromoting_client.cc |
+++ b/remoting/client/chromoting_client.cc |
@@ -11,7 +11,6 @@ |
#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" |
@@ -53,14 +52,9 @@ void ChromotingClient::Start( |
DCHECK(message_loop()->BelongsToCurrentThread()); |
scoped_ptr<protocol::Authenticator> authenticator; |
- 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); |
- } |
+ 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(), |