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

Unified Diff: remoting/signaling/xmpp_signal_strategy.cc

Issue 429253003: Webrtc deps roll. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 5 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 | « remoting/signaling/xmpp_signal_strategy.h ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/signaling/xmpp_signal_strategy.cc
===================================================================
--- remoting/signaling/xmpp_signal_strategy.cc (revision 286889)
+++ remoting/signaling/xmpp_signal_strategy.cc (working copy)
@@ -17,9 +17,9 @@
#include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
#include "net/socket/client_socket_factory.h"
#include "net/url_request/url_request_context_getter.h"
-#include "third_party/libjingle/source/talk/base/thread.h"
#include "third_party/libjingle/source/talk/xmpp/prexmppauth.h"
#include "third_party/libjingle/source/talk/xmpp/saslcookiemechanism.h"
+#include "third_party/webrtc/base/thread.h"
const char kDefaultResourceName[] = "chromoting";
@@ -77,7 +77,7 @@
settings.set_token_service(xmpp_server_config_.auth_service);
settings.set_auth_token(buzz::AUTH_MECHANISM_GOOGLE_TOKEN,
xmpp_server_config_.auth_token);
- settings.set_server(talk_base::SocketAddress(
+ settings.set_server(rtc::SocketAddress(
xmpp_server_config_.host, xmpp_server_config_.port));
settings.set_use_tls(
xmpp_server_config_.use_tls ? buzz::TLS_ENABLED : buzz::TLS_DISABLED);
« no previous file with comments | « remoting/signaling/xmpp_signal_strategy.h ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698