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

Unified Diff: remoting/signaling/jingle_info_request.cc

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/jingle_info_request.h ('k') | remoting/signaling/xmpp_signal_strategy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/signaling/jingle_info_request.cc
diff --git a/remoting/signaling/jingle_info_request.cc b/remoting/signaling/jingle_info_request.cc
index 553429648aae59e39bf5a442d0c8f170c786dda0..0fc4ab4e411d4e0fd9f5621b09ebde342d58a830 100644
--- a/remoting/signaling/jingle_info_request.cc
+++ b/remoting/signaling/jingle_info_request.cc
@@ -11,9 +11,9 @@
#include "base/time/time.h"
#include "net/base/net_util.h"
#include "remoting/signaling/iq_sender.h"
+#include "third_party/libjingle/source/talk/base/socketaddress.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
#include "third_party/libjingle/source/talk/xmpp/constants.h"
-#include "third_party/webrtc/base/socketaddress.h"
namespace remoting {
@@ -35,7 +35,7 @@ void JingleInfoRequest::Send(const OnJingleInfoCallback& callback) {
if (!request_) {
// If we failed to send IqRequest it means that SignalStrategy is
// disconnected. Notify the caller.
- std::vector<rtc::SocketAddress> stun_hosts;
+ std::vector<talk_base::SocketAddress> stun_hosts;
std::vector<std::string> relay_hosts;
std::string relay_token;
on_jingle_info_cb_.Run(relay_token, relay_hosts, stun_hosts);
@@ -46,7 +46,7 @@ void JingleInfoRequest::Send(const OnJingleInfoCallback& callback) {
void JingleInfoRequest::OnResponse(IqRequest* request,
const buzz::XmlElement* stanza) {
- std::vector<rtc::SocketAddress> stun_hosts;
+ std::vector<talk_base::SocketAddress> stun_hosts;
std::vector<std::string> relay_hosts;
std::string relay_token;
@@ -80,7 +80,7 @@ void JingleInfoRequest::OnResponse(IqRequest* request,
continue;
}
- stun_hosts.push_back(rtc::SocketAddress(host, port));
+ stun_hosts.push_back(talk_base::SocketAddress(host, port));
}
}
}
« no previous file with comments | « remoting/signaling/jingle_info_request.h ('k') | remoting/signaling/xmpp_signal_strategy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698