Changes needed to roll libjingle r141

jingle/notifier/communicator/single_login_attempt.cc

 // Copyright (c) 2011 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 <algorithm>
 #include <cstddef>
 #include <string>
 #include <vector>
 
 #include "jingle/notifier/communicator/single_login_attempt.h"
@@ skipping 93 matching lines @@
     const ConnectionSettings& connection_settings) {
   buzz::XmppClientSettings client_settings =
       login_settings_->user_settings();
   // Fill in the rest of the client settings.
   connection_settings.FillXmppClientSettings(&client_settings);
 
   buzz::Jid jid(client_settings.user(), client_settings.host(),
                 buzz::STR_EMPTY);
   buzz::PreXmppAuth* pre_xmpp_auth =
       new GaiaTokenPreXmppAuth(
-          jid.Str(), client_settings.auth_cookie(),
+          jid.Str(), client_settings.auth_token(),
           client_settings.token_service(),
           login_settings_->auth_mechanism());
   xmpp_connection_.reset(
       new XmppConnection(client_settings,
                          login_settings_->request_context_getter(),
                          this, pre_xmpp_auth));
 }
 
 void SingleLoginAttempt::OnExhaustedSettings(
     bool successfully_resolved_dns,
     int first_dns_error) {
   if (!successfully_resolved_dns)
     VLOG(1) << "Could not resolve DNS: " << first_dns_error;
   VLOG(1) << "Could not connect to any XMPP server";
   delegate_->OnNeedReconnect();
 }
 
 }  // namespace notifier