Update webrtc&libjingle 6774:6825.

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 287594)
+++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc	(working copy)
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "talk/base/socketaddress.h"
 #include "talk/xmpp/constants.h"
 #include "talk/xmpp/saslcookiemechanism.h"
+#include "webrtc/base/socketaddress.h"
 
 namespace notifier {
 
@@ -64,8 +64,8 @@
 
 void GaiaTokenPreXmppAuth::StartPreXmppAuth(
     const buzz::Jid& jid,
-    const talk_base::SocketAddress& server,
-    const talk_base::CryptString& pass,
+    const rtc::SocketAddress& server,
+    const rtc::CryptString& pass,
     const std::string& auth_mechanism,
     const std::string& auth_token) {
   SignalAuthDone();