Roll libjingle r313.

Reviewed and tried here:
https://chromiumcodereview.appspot.com/15021002/

TBR=sergeyu@chromium.org

Review URL: https://codereview.chromium.org/14781007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198614 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 34 insertions, 30 deletions

diff --git a/DEPS b/DEPS
index a5f205c..f0d49f0 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,7 @@ vars = {
   "nacl_tools_revision": "11040",  # native_client/DEPS: tools_rev
   "gtm_revision": "608",
 
-  "libjingle_revision": "312",
+  "libjingle_revision": "313",
   "libphonenumber_revision": "456",
   "libvpx_revision": "197977",
   "lss_revision": "20",
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index d1f5686..641b50a 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -368,15 +368,16 @@ talk_base::AsyncPacketSocket* IpcPacketSocketFactory::CreateUdpSocket(
 
 talk_base::AsyncPacketSocket* IpcPacketSocketFactory::CreateServerTcpSocket(
     const talk_base::SocketAddress& local_address, int min_port, int max_port,
-    bool ssl) {
+    int opts) {
   // TODO(sergeyu): Implement SSL support.
-  if (ssl)
+  if (opts & talk_base::PacketSocketFactory::OPT_SSLTCP)
     return NULL;
 
-  talk_base::SocketAddress crome_address;
+  P2PSocketType type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
+      P2P_SOCKET_STUN_TCP_CLIENT : P2P_SOCKET_TCP_CLIENT;
   P2PSocketClient* socket_client = new P2PSocketClient(socket_dispatcher_);
   scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
-  if (!socket->Init(P2P_SOCKET_TCP_SERVER, socket_client, local_address,
+  if (!socket->Init(type, socket_client, local_address,
                     talk_base::SocketAddress())) {
     return NULL;
   }
@@ -387,15 +388,16 @@ talk_base::AsyncPacketSocket* IpcPacketSocketFactory::CreateClientTcpSocket(
     const talk_base::SocketAddress& local_address,
     const talk_base::SocketAddress& remote_address,
     const talk_base::ProxyInfo& proxy_info,
-    const std::string& user_agent, bool ssl) {
+    const std::string& user_agent, int opts) {
   // TODO(sergeyu): Implement SSL support.
-  if (ssl)
+  if (opts & talk_base::PacketSocketFactory::OPT_SSLTCP)
     return NULL;
 
-  talk_base::SocketAddress crome_address;
+  P2PSocketType type = (opts & talk_base::PacketSocketFactory::OPT_STUN) ?
+      P2P_SOCKET_STUN_TCP_SERVER : P2P_SOCKET_TCP_SERVER;
   P2PSocketClient* socket_client = new P2PSocketClient(socket_dispatcher_);
   scoped_ptr<IpcPacketSocket> socket(new IpcPacketSocket());
-  if (!socket->Init(P2P_SOCKET_TCP_CLIENT, socket_client, local_address,
+  if (!socket->Init(type, socket_client, local_address,
                     remote_address))
     return NULL;
   return socket.release();
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index bf91656..cb41883 100644
--- a/content/renderer/p2p/ipc_socket_factory.h
+++ b/content/renderer/p2p/ipc_socket_factory.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
-#include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
+#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace content {
 
@@ -33,13 +33,13 @@ class IpcPacketSocketFactory : public talk_base::PacketSocketFactory {
       const talk_base::SocketAddress& local_address,
       int min_port,
       int max_port,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
       const talk_base::SocketAddress& local_address,
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
 
  private:
   P2PSocketDispatcher* socket_dispatcher_;
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc
index 2347bef..325497a 100644
--- a/jingle/glue/fake_socket_factory.cc
+++ b/jingle/glue/fake_socket_factory.cc
@@ -176,7 +176,7 @@ talk_base::AsyncPacketSocket* FakeSocketFactory::CreateUdpSocket(
 
 talk_base::AsyncPacketSocket* FakeSocketFactory::CreateServerTcpSocket(
     const talk_base::SocketAddress& local_address, int min_port, int max_port,
-    bool ssl) {
+    int opts) {
   // TODO(sergeyu): Implement fake TCP sockets.
   NOTIMPLEMENTED();
   return NULL;
@@ -186,7 +186,7 @@ talk_base::AsyncPacketSocket* FakeSocketFactory::CreateClientTcpSocket(
     const talk_base::SocketAddress& local_address,
     const talk_base::SocketAddress& remote_address,
     const talk_base::ProxyInfo& proxy_info, const std::string& user_agent,
-    bool ssl) {
+    int opts) {
   // TODO(sergeyu): Implement fake TCP sockets.
   NOTIMPLEMENTED();
   return NULL;
diff --git a/jingle/glue/fake_socket_factory.h b/jingle/glue/fake_socket_factory.h
index 6cbfb75..cb56a3c 100644
--- a/jingle/glue/fake_socket_factory.h
+++ b/jingle/glue/fake_socket_factory.h
@@ -14,7 +14,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/ip_endpoint.h"
 #include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
-#include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
+#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace base {
 class MessageLoop;
@@ -102,13 +102,13 @@ class FakeSocketFactory : public talk_base::PacketSocketFactory {
       int min_port, int max_port) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket(
       const talk_base::SocketAddress& local_address, int min_port, int max_port,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
       const talk_base::SocketAddress& local_address,
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
 
  private:
   scoped_refptr<FakeSocketManager> socket_manager_;
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index c83942d..ea6ad98 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -363,7 +363,7 @@ talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateServerTcpSocket(
     const talk_base::SocketAddress& local_address,
     int min_port,
     int max_port,
-    bool ssl) {
+    int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
@@ -374,7 +374,7 @@ talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateClientTcpSocket(
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) {
+      int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h
index ec9634f..51cde23 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.h
+++ b/remoting/client/plugin/pepper_packet_socket_factory.h
@@ -7,7 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "ppapi/cpp/instance_handle.h"
-#include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
+#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
 
@@ -23,13 +23,13 @@ class PepperPacketSocketFactory : public talk_base::PacketSocketFactory {
       const talk_base::SocketAddress& local_address,
       int min_port,
       int max_port,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
       const talk_base::SocketAddress& local_address,
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
 
  private:
   const pp::InstanceHandle pp_instance_;
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc
index aba0ef85..2798391 100644
--- a/remoting/jingle_glue/chromium_socket_factory.cc
+++ b/remoting/jingle_glue/chromium_socket_factory.cc
@@ -342,7 +342,7 @@ talk_base::AsyncPacketSocket*
 ChromiumPacketSocketFactory::CreateServerTcpSocket(
     const talk_base::SocketAddress& local_address,
     int min_port, int max_port,
-    bool ssl) {
+    int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
@@ -354,7 +354,7 @@ ChromiumPacketSocketFactory::CreateClientTcpSocket(
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) {
+      int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
diff --git a/remoting/jingle_glue/chromium_socket_factory.h b/remoting/jingle_glue/chromium_socket_factory.h
index f142ad2..eb70b5b 100644
--- a/remoting/jingle_glue/chromium_socket_factory.h
+++ b/remoting/jingle_glue/chromium_socket_factory.h
@@ -6,7 +6,7 @@
 #define REMOTING_JINGLE_GLUE_CHROMIUM_SOCKET_FACTORY_H_
 
 #include "base/compiler_specific.h"
-#include "third_party/libjingle/source/talk/base/packetsocketfactory.h"
+#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
 
@@ -21,13 +21,13 @@ class ChromiumPacketSocketFactory : public talk_base::PacketSocketFactory {
   virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket(
       const talk_base::SocketAddress& local_address,
       int min_port, int max_port,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
       const talk_base::SocketAddress& local_address,
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl) OVERRIDE;
+      int opts) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromiumPacketSocketFactory);
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index fc408b5..da856c9 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: unknown
-Revision: 312
+Revision: 313
 License: BSD
 License File: source/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index aa39c5a..3ef926b 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -261,8 +261,6 @@
         '<(libjingle_source)/talk/base/base64.cc',
         '<(libjingle_source)/talk/base/base64.h',
         '<(libjingle_source)/talk/base/basicdefs.h',
-        '<(libjingle_source)/talk/base/basicpacketsocketfactory.cc',
-        '<(libjingle_source)/talk/base/basicpacketsocketfactory.h',
         '<(libjingle_source)/talk/base/bytebuffer.cc',
         '<(libjingle_source)/talk/base/bytebuffer.h',
         '<(libjingle_source)/talk/base/byteorder.h',
@@ -390,6 +388,10 @@
         '<(libjingle_source)/talk/base/urlencode.h',
         '<(libjingle_source)/talk/base/worker.cc',
         '<(libjingle_source)/talk/base/worker.h',
+        '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc',
+        '<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h',
+        '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc',
+        '<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.h',
         '<(libjingle_source)/talk/p2p/base/candidate.h',
         '<(libjingle_source)/talk/p2p/base/common.h',
         '<(libjingle_source)/talk/p2p/base/dtlstransport.h',