Changes needed to roll libjingle r141

jingle/notifier/base/gaia_token_pre_xmpp_auth.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 "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 51 matching lines @@
       auth_mechanism_(auth_mechanism) {
   DCHECK(!auth_mechanism_.empty());
 }
 
 GaiaTokenPreXmppAuth::~GaiaTokenPreXmppAuth() { }
 
 void GaiaTokenPreXmppAuth::StartPreXmppAuth(
     const buzz::Jid& jid,
     const talk_base::SocketAddress& server,
     const talk_base::CryptString& pass,
-    const std::string& auth_cookie) {
+    const std::string& auth_mechanism,
+    const std::string& auth_token) {
   SignalAuthDone();
 }
 
 bool GaiaTokenPreXmppAuth::IsAuthDone() const {
   return true;
 }
 
 bool GaiaTokenPreXmppAuth::IsAuthorized() const {
   return true;
 }
 
 bool GaiaTokenPreXmppAuth::HadError() const {
   return false;
 }
 
 int GaiaTokenPreXmppAuth::GetError() const {
   return 0;
 }
 
 buzz::CaptchaChallenge GaiaTokenPreXmppAuth::GetCaptchaChallenge() const {
   return buzz::CaptchaChallenge();
 }
 
-std::string GaiaTokenPreXmppAuth::GetAuthCookie() const {
-  return std::string();
+std::string GaiaTokenPreXmppAuth::GetAuthToken() const {
+  return token_;
+}
+
+std::string GaiaTokenPreXmppAuth::GetAuthMechanism() const {
+  return auth_mechanism_;
 }
 
 std::string GaiaTokenPreXmppAuth::ChooseBestSaslMechanism(
     const std::vector<std::string> & mechanisms, bool encrypted) {
   return (std::find(mechanisms.begin(),
                     mechanisms.end(), auth_mechanism_) !=
           mechanisms.end()) ? auth_mechanism_ : "";
 }
 
 buzz::SaslMechanism* GaiaTokenPreXmppAuth::CreateSaslMechanism(
     const std::string& mechanism) {
   if (mechanism == auth_mechanism_)
     return new GaiaCookieMechanism(
         mechanism, username_, token_, token_service_);
   return NULL;
 }
 
 }  // namespace notifier