Changes needed to roll libjingle r141

remoting/jingle_glue/xmpp_signal_strategy.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/jingle_glue/xmpp_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
@@ skipping 43 matching lines @@
   // Disconnect first if we are currently connected.
   Disconnect();
 
   buzz::XmppClientSettings settings;
   buzz::Jid login_jid(username_);
   settings.set_user(login_jid.node());
   settings.set_host(login_jid.domain());
   settings.set_resource(resource_name_);
   settings.set_use_tls(buzz::TLS_ENABLED);
   settings.set_token_service(auth_token_service_);
-  settings.set_auth_cookie(auth_token_);
+  settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN, auth_token_);
   settings.set_server(talk_base::SocketAddress("talk.google.com", 5222));
 
   buzz::AsyncSocket* socket = new XmppSocketAdapter(settings, false);
 
   xmpp_client_ = new buzz::XmppClient(thread_->task_pump());
   xmpp_client_->Connect(settings, "", socket, CreatePreXmppAuth(settings));
   xmpp_client_->SignalStateChange.connect(
       this, &XmppSignalStrategy::OnConnectionStateChanged);
   xmpp_client_->engine()->AddStanzaHandler(this, buzz::XmppEngine::HL_TYPE);
   xmpp_client_->Start();
@@ skipping 139 matching lines @@
 // static
 buzz::PreXmppAuth* XmppSignalStrategy::CreatePreXmppAuth(
     const buzz::XmppClientSettings& settings) {
   buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
   std::string mechanism = notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism;
   if (settings.token_service() == "oauth2") {
     mechanism = "X-OAUTH2";
   }
 
   return new notifier::GaiaTokenPreXmppAuth(
-      jid.Str(), settings.auth_cookie(), settings.token_service(), mechanism);
+      jid.Str(), settings.auth_token(), settings.token_service(), mechanism);
 }
 
 }  // namespace remoting