Roll WebRTC 15659:15690 (27 commits)

content/renderer/p2p/ipc_socket_factory.cc

Index: content/renderer/p2p/ipc_socket_factory.cc
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 08cafbf11672a147be592fdbfea329b738841b78..fd112de3ef99ec0f806597355530c0783ac25ca4 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -764,7 +764,7 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateServerTcpSocket(
     uint16_t max_port,
     int opts) {
   // TODO(sergeyu): Implement SSL support.
-  if (opts & rtc::PacketSocketFactory::OPT_SSLTCP)
+  if (opts & rtc::PacketSocketFactory::OPT_TLS_FAKE)
     return NULL;
 
   P2PSocketType type = (opts & rtc::PacketSocketFactory::OPT_STUN) ?
@@ -785,7 +785,7 @@ rtc::AsyncPacketSocket* IpcPacketSocketFactory::CreateClientTcpSocket(
     const rtc::ProxyInfo& proxy_info,
     const std::string& user_agent, int opts) {
   P2PSocketType type;
-  if (opts & rtc::PacketSocketFactory::OPT_SSLTCP) {
+  if (opts & rtc::PacketSocketFactory::OPT_TLS_FAKE) {
     type = (opts & rtc::PacketSocketFactory::OPT_STUN) ?
         P2P_SOCKET_STUN_SSLTCP_CLIENT : P2P_SOCKET_SSLTCP_CLIENT;
   } else if (opts & rtc::PacketSocketFactory::OPT_TLS) {