Remove ClientLogin support from remoting host

remoting/signaling/xmpp_signal_strategy.cc

 // Copyright 2014 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/signaling/xmpp_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 65 matching lines @@
   DCHECK(CalledOnValidThread());
 
   // Disconnect first if we are currently connected.
   Disconnect();
 
   buzz::XmppClientSettings settings;
   buzz::Jid login_jid(xmpp_server_config_.username);
   settings.set_user(login_jid.node());
   settings.set_host(login_jid.domain());
   settings.set_resource(resource_name_);
-  settings.set_token_service(xmpp_server_config_.auth_service);
+  settings.set_token_service("oauth2");
   settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,
                           xmpp_server_config_.auth_token);
 
   int port = xmpp_server_config_.port;
 
   // Port 5222 may be blocked by firewall. talk.google.com allows connections on
   // port 443 which can be used instead of 5222. The webapp still requests to
   // use port 5222 for backwards compatibility with older versions of the host
   // that do not pass correct |use_fake_ssl_client_socket| value to
   // XmppClientSocketFactory (and so cannot connect to port 443). In case we are
@@ skipping 99 matching lines @@
   ObserverListBase<Listener>::Iterator it(listeners_);
   Listener* listener;
   while ((listener = it.GetNext()) != nullptr) {
     if (listener->OnSignalStrategyIncomingStanza(stanza))
       return true;
   }
   return false;
 }
 
 void XmppSignalStrategy::SetAuthInfo(const std::string& username,
-                                     const std::string& auth_token,
-                                     const std::string& auth_service) {
+                                     const std::string& auth_token) {
   DCHECK(CalledOnValidThread());
   xmpp_server_config_.username = username;
   xmpp_server_config_.auth_token = auth_token;
-  xmpp_server_config_.auth_service = auth_service;
 }
 
 void XmppSignalStrategy::SetResourceName(const std::string &resource_name) {
   DCHECK(CalledOnValidThread());
   resource_name_ = resource_name;
 }
 
 void XmppSignalStrategy::OnConnectionStateChanged(
     buzz::XmppEngine::State state) {
   DCHECK(CalledOnValidThread());
@@ skipping 40 matching lines @@
 }
 
 void XmppSignalStrategy::SendKeepAlive() {
   xmpp_client_->SendRaw(" ");
 }
 
 // static
 buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth(
     const buzz::XmppClientSettings& settings) {
   buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
-  std::string mechanism = notifier::kDefaultGaiaAuthMechanism;
-  if (settings.token_service() == "oauth2") {
-    mechanism = "X-OAUTH2";
-  }
-
   return new notifier::GaiaTokenPreXmppAuth(
-      jid.Str(), settings.auth_token(), settings.token_service(), mechanism);
+      jid.Str(), settings.auth_token(), settings.token_service(), "X-OAUTH2");
 }
 
 }  // namespace remoting