| Index: jingle/notifier/communicator/connection_settings.cc
|
| diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc
|
| index 164bbbc688d1f71515affcb6c8c28158eb9a7041..862f905800fe9272b62d4a80d23969df21a0073f 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 rtc::SocketAddress& server,
|
| + const talk_base::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(
|
| - rtc::SocketAddress(it->server.host(), it->server.port()),
|
| + talk_base::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(
|
| - rtc::SocketAddress(it->server.host(), kSslTcpPort),
|
| + talk_base::SocketAddress(it->server.host(), kSslTcpPort),
|
| USE_SSLTCP, it->ssltcp_support);
|
|
|
| if (try_ssltcp_first) {
|
|
|