Changes needed to roll libjingle r141

jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

Index: jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
===================================================================
--- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc	(revision 136430)
+++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc	(working copy)
@@ -69,7 +69,8 @@
     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();
 }
 
@@ -93,10 +94,14 @@
   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(),