| Index: jingle/notifier/communicator/connection_settings.cc
|
| ===================================================================
|
| --- jingle/notifier/communicator/connection_settings.cc (revision 287594)
|
| +++ jingle/notifier/communicator/connection_settings.cc (working copy)
|
| @@ -18,7 +18,7 @@
|
| 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 @@
|
| 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) {
|
|
|