Changes needed to roll libjingle r141

jingle/notifier/base/notifier_options_util.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 "jingle/notifier/base/notifier_options_util.h"
 
 #include "base/logging.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options.h"
+#include "talk/xmpp/constants.h"
 #include "talk/xmpp/jid.h"
 
 namespace notifier {
 
 buzz::XmppClientSettings MakeXmppClientSettings(
     const NotifierOptions& notifier_options,
     const std::string& email, const std::string& token) {
   buzz::Jid jid = buzz::Jid(email);
   DCHECK(!jid.node().empty());
   DCHECK(jid.IsValid());
 
   buzz::XmppClientSettings xmpp_client_settings;
   xmpp_client_settings.set_user(jid.node());
   xmpp_client_settings.set_resource("chrome-sync");
   xmpp_client_settings.set_host(jid.domain());
   xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED);
-  xmpp_client_settings.set_auth_cookie(
+  xmpp_client_settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,
       notifier_options.invalidate_xmpp_login ?
       token + "bogus" : token);
   xmpp_client_settings.set_token_service("chromiumsync");
   if (notifier_options.allow_insecure_connection) {
     xmpp_client_settings.set_allow_plain(true);
     xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED);
   }
   return xmpp_client_settings;
 }
 
@@ skipping 16 matching lines @@
     servers.push_back(
         ServerInformation(
             net::HostPortPair("talkx.l.google.com",
                               notifier::kDefaultXmppPort),
             SUPPORTS_SSLTCP));
   }
   return servers;
 }
 
 }  // namespace notifier