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

Unified Diff: jingle/notifier/communicator/connection_settings.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:
View side-by-side diff with in-line comments
Download patch
Index: jingle/notifier/communicator/connection_settings.cc
diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc
index 862f905800fe9272b62d4a80d23969df21a0073f..164bbbc688d1f71515affcb6c8c28158eb9a7041 100644
--- a/jingle/notifier/communicator/connection_settings.cc
+++ b/jingle/notifier/communicator/connection_settings.cc
@@ -18,7 +18,7 @@ namespace notifier {
const uint16 kSslTcpPort = 443;
ConnectionSettings::ConnectionSettings(
- const talk_base::SocketAddress& server,
+ const rtc::SocketAddress& server,
SslTcpMode ssltcp_mode,
SslTcpSupport ssltcp_support)
: server(server),
@@ -76,12 +76,12 @@ ConnectionSettingsList MakeConnectionSettingsList(
for (ServerList::const_iterator it = servers.begin();
it != servers.end(); ++it) {
const ConnectionSettings settings(
- talk_base::SocketAddress(it->server.host(), it->server.port()),
+ rtc::SocketAddress(it->server.host(), it->server.port()),
DO_NOT_USE_SSLTCP, it->ssltcp_support);
if (it->ssltcp_support == SUPPORTS_SSLTCP) {
const ConnectionSettings settings_with_ssltcp(
- talk_base::SocketAddress(it->server.host(), kSslTcpPort),
+ rtc::SocketAddress(it->server.host(), kSslTcpPort),
USE_SSLTCP, it->ssltcp_support);
if (try_ssltcp_first) {
« no previous file with comments | « jingle/notifier/communicator/connection_settings.h ('k') | jingle/notifier/communicator/connection_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698