Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

Issue 450463002: Update webrtc&libjingle 6774:6825. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/notifier/base/gaia_token_pre_xmpp_auth.h ('k') | jingle/notifier/base/weak_xmpp_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « jingle/notifier/base/gaia_token_pre_xmpp_auth.h ('k') | jingle/notifier/base/weak_xmpp_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698