jingle/notifier/base/gaia_token_pre_xmpp_auth.cc - Issue 429113002: Webrtc deps roll.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. 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:

Index: jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

index f7ddf8dca7b30d0e4394a7f0e304a4f3eb96643c..4fc8e18fde221fd79c34436f111f504fffc30a09 100644

--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc

@@ -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 @@ GaiaTokenPreXmppAuth::~GaiaTokenPreXmppAuth() { }

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();