Roll WebRTC 7546:7549.

TBR=hellner@chromium.org
NOTRY=true
BUG=N/A

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

Cr-Commit-Position: refs/heads/master@{#301879}

73 files changed, 318 insertions, 379 deletions

diff --git a/DEPS b/DEPS
index 26ddfd0..34bb55b 100644
--- a/DEPS
+++ b/DEPS
@@ -220,7 +220,7 @@ deps = {
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '4bc3dc1af71c98bb257fba5e442303f68b4ff8fc',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'c103da3cd4f12eb017c74963eeaf2204cb9ed5eb', # from svn revision 7546
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '5910fdfb2ca4b12096bdc5c64aee0afc7f93d426', # from svn revision 7549
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14',
@@ -244,7 +244,7 @@ deps = {
    Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '4f2aa0829e4e69972202efb7de2f53cc8858e2c9', # from svn revision 7546
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '1a02faa335e7d8076b5cf8dd9a584e72669b0c8e', # from svn revision 7549
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
diff --git a/components/invalidation/DEPS b/components/invalidation/DEPS
index 6a1570f..c0b4f02 100644
--- a/components/invalidation/DEPS
+++ b/components/invalidation/DEPS
@@ -18,5 +18,5 @@ include_rules = [
   "+net/url_request",
 
   # invalidation_notifier depends on the xmpp part of libjingle.
-  "+talk/xmpp",
+  "+webrtc/libjingle/xmpp",
 ]
diff --git a/components/invalidation/invalidation_notifier.cc b/components/invalidation/invalidation_notifier.cc
index 359ac05..901129b 100644
--- a/components/invalidation/invalidation_notifier.cc
+++ b/components/invalidation/invalidation_notifier.cc
@@ -12,8 +12,8 @@
 #include "google/cacheinvalidation/include/invalidation-client-factory.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
-#include "talk/xmpp/jid.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace syncer {
 
diff --git a/content/browser/renderer_host/p2p/socket_host.cc b/content/browser/renderer_host/p2p/socket_host.cc
index 6fce88b..8f6e71f 100644
--- a/content/browser/renderer_host/p2p/socket_host.cc
+++ b/content/browser/renderer_host/p2p/socket_host.cc
@@ -12,10 +12,10 @@
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/hmac.h"
-#include "third_party/libjingle/source/talk/p2p/base/stun.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/messagedigest.h"
+#include "third_party/webrtc/p2p/base/stun.h"
 
 namespace {
 
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index 3e8797a..22da222 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/p2p/base/packetsocketfactory.h"
+#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
 
 namespace content {
 
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index f601a09..3cb1377 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 #define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 
-#include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
+#include "third_party/webrtc/p2p/client/basicportallocator.h"
 
 namespace content {
 
diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc
index 1645f96..5550e0f 100644
--- a/jingle/glue/channel_socket_adapter.cc
+++ b/jingle/glue/channel_socket_adapter.cc
@@ -11,7 +11,7 @@
 #include "base/message_loop/message_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
+#include "third_party/webrtc/p2p/base/transportchannel.h"
 
 namespace jingle_glue {
 
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 2baa37f..7c12f0d 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -11,7 +11,7 @@
 #include "net/socket/socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/p2p/base/transportchannel.h"
+#include "third_party/webrtc/p2p/base/transportchannel.h"
 
 using net::IOBuffer;
 
diff --git a/jingle/glue/chrome_async_socket.h b/jingle/glue/chrome_async_socket.h
index af6a8fc..3ce97a4 100644
--- a/jingle/glue/chrome_async_socket.h
+++ b/jingle/glue/chrome_async_socket.h
@@ -21,7 +21,7 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
+#include "third_party/webrtc/libjingle/xmpp/asyncsocket.h"
 
 namespace net {
 class IOBufferWithSize;
diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h
index b410b82..7903633 100644
--- a/jingle/glue/pseudotcp_adapter.h
+++ b/jingle/glue/pseudotcp_adapter.h
@@ -12,7 +12,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_socket.h"
-#include "third_party/libjingle/source/talk/p2p/base/pseudotcp.h"
+#include "third_party/webrtc/p2p/base/pseudotcp.h"
 
 namespace jingle_glue {
 
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index acf45cb..4d35650 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -11,9 +11,9 @@
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
-#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/socketaddress.h"
+#include "third_party/webrtc/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
diff --git a/jingle/notifier/base/fake_base_task.cc b/jingle/notifier/base/fake_base_task.cc
index c1805b4..af4ede0 100644
--- a/jingle/notifier/base/fake_base_task.cc
+++ b/jingle/notifier/base/fake_base_task.cc
@@ -5,8 +5,8 @@
 #include "base/compiler_specific.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
-#include "talk/xmpp/asyncsocket.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/libjingle/xmpp/asyncsocket.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
index b213095..b8a2b15 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/saslcookiemechanism.h"
 #include "webrtc/base/socketaddress.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/saslcookiemechanism.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
index 0ff49ff..7b86bd5 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "talk/xmpp/prexmppauth.h"
+#include "webrtc/libjingle/xmpp/prexmppauth.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc
index fa48209..9949d4e 100644
--- a/jingle/notifier/base/notifier_options_util.cc
+++ b/jingle/notifier/base/notifier_options_util.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/notifier_options_util.h b/jingle/notifier/base/notifier_options_util.h
index 6ba2471..2d14429 100644
--- a/jingle/notifier/base/notifier_options_util.h
+++ b/jingle/notifier/base/notifier_options_util.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "jingle/notifier/base/server_information.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h
index d77903c6..66f2e72 100644
--- a/jingle/notifier/base/weak_xmpp_client.h
+++ b/jingle/notifier/base/weak_xmpp_client.h
@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "talk/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace rtc {
 class TaskParent;
diff --git a/jingle/notifier/base/xmpp_connection.cc b/jingle/notifier/base/xmpp_connection.cc
index 08a8ee3..14c1897 100644
--- a/jingle/notifier/base/xmpp_connection.cc
+++ b/jingle/notifier/base/xmpp_connection.cc
@@ -15,7 +15,7 @@
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request_context.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/base/xmpp_connection.h b/jingle/notifier/base/xmpp_connection.h
index bc75605..bc1ec2a 100644
--- a/jingle/notifier/base/xmpp_connection.h
+++ b/jingle/notifier/base/xmpp_connection.h
@@ -14,8 +14,8 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "talk/xmpp/xmppengine.h"
 #include "webrtc/base/sigslot.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class PreXmppAuth;
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
index 3559b4b..682c8d1 100644
--- a/jingle/notifier/base/xmpp_connection_unittest.cc
+++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -18,10 +18,10 @@
 #include "net/cert/cert_verifier.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
-#include "talk/xmpp/prexmppauth.h"
-#include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/libjingle/xmpp/prexmppauth.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace buzz {
 class CaptchaChallenge;
diff --git a/jingle/notifier/communicator/DEPS b/jingle/notifier/communicator/DEPS
index fe7e23f..ebe0a7b6 100644
--- a/jingle/notifier/communicator/DEPS
+++ b/jingle/notifier/communicator/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   # Need for cricket::ProtocolType.
-  "+talk/p2p/base/port.h",
+  "+webrtc/p2p/base/port.h",
 ]
diff --git a/jingle/notifier/communicator/connection_settings.cc b/jingle/notifier/communicator/connection_settings.cc
index 164bbbc..12d78c2 100644
--- a/jingle/notifier/communicator/connection_settings.cc
+++ b/jingle/notifier/communicator/connection_settings.cc
@@ -6,12 +6,11 @@
 
 #include "base/logging.h"
 
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 // Ideally we shouldn't include anything from talk/p2p, but we need
 // the definition of ProtocolType.  Don't use any functions from
 // port.h, since it won't link.
-#include "talk/p2p/base/port.h"
-
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/p2p/base/port.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/communicator/login.cc b/jingle/notifier/communicator/login.cc
index 837f257..aacfa41 100644
--- a/jingle/notifier/communicator/login.cc
+++ b/jingle/notifier/communicator/login.cc
@@ -10,17 +10,17 @@
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
-#include "talk/xmpp/asyncsocket.h"
-#include "talk/xmpp/prexmppauth.h"
-#include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/firewallsocketserver.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/taskrunner.h"
+#include "webrtc/libjingle/xmpp/asyncsocket.h"
+#include "webrtc/libjingle/xmpp/prexmppauth.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index a8646f6..cfc4267 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -17,7 +17,7 @@
 #include "jingle/notifier/communicator/login_settings.h"
 #include "jingle/notifier/communicator/single_login_attempt.h"
 #include "net/base/network_change_notifier.h"
-#include "talk/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppClient;
diff --git a/jingle/notifier/communicator/login_settings.h b/jingle/notifier/communicator/login_settings.h
index 04ab92d..00a9589 100644
--- a/jingle/notifier/communicator/login_settings.h
+++ b/jingle/notifier/communicator/login_settings.h
@@ -10,7 +10,7 @@
 #include "base/time/time.h"
 #include "jingle/notifier/base/server_information.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/communicator/login_settings_unittest.cc b/jingle/notifier/communicator/login_settings_unittest.cc
index 5919d1d..72e769a 100644
--- a/jingle/notifier/communicator/login_settings_unittest.cc
+++ b/jingle/notifier/communicator/login_settings_unittest.cc
@@ -6,8 +6,8 @@
 
 #include <cstddef>
 
-#include "talk/xmpp/xmppclientsettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc
index 2f7dc21..a7309ba 100644
--- a/jingle/notifier/communicator/single_login_attempt.cc
+++ b/jingle/notifier/communicator/single_login_attempt.cc
@@ -14,9 +14,9 @@
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "jingle/notifier/listener/xml_element_util.h"
 #include "net/base/host_port_pair.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppclientsettings.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/communicator/single_login_attempt.h b/jingle/notifier/communicator/single_login_attempt.h
index 5480e3c..3b7f89a 100644
--- a/jingle/notifier/communicator/single_login_attempt.h
+++ b/jingle/notifier/communicator/single_login_attempt.h
@@ -10,7 +10,7 @@
 #include "jingle/notifier/base/xmpp_connection.h"
 #include "jingle/notifier/communicator/connection_settings.h"
 #include "jingle/notifier/communicator/login_settings.h"
-#include "talk/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 2a9b5af..d5b7418 100644
--- a/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -14,10 +14,10 @@
 #include "jingle/notifier/communicator/login_settings.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/url_request/url_request_test_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppengine.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
diff --git a/jingle/notifier/listener/push_notifications_listen_task.cc b/jingle/notifier/listener/push_notifications_listen_task.cc
index 4457535..4e6a276 100644
--- a/jingle/notifier/listener/push_notifications_listen_task.cc
+++ b/jingle/notifier/listener/push_notifications_listen_task.cc
@@ -9,12 +9,12 @@
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/task.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/listener/push_notifications_listen_task.h b/jingle/notifier/listener/push_notifications_listen_task.h
index 7efd95c..d5bdf06 100644
--- a/jingle/notifier/listener/push_notifications_listen_task.h
+++ b/jingle/notifier/listener/push_notifications_listen_task.h
@@ -14,7 +14,7 @@
 #define JINGLE_NOTIFIER_PUSH_NOTIFICATIONS_LISTENER_LISTEN_TASK_H_
 
 #include "base/compiler_specific.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/jingle/notifier/listener/push_notifications_send_update_task.cc b/jingle/notifier/listener/push_notifications_send_update_task.cc
index 7c9eeb4..c45a891 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task.cc
+++ b/jingle/notifier/listener/push_notifications_send_update_task.cc
@@ -11,11 +11,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
-#include "talk/xmpp/xmppclient.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/listener/push_notifications_send_update_task.h b/jingle/notifier/listener/push_notifications_send_update_task.h
index 773e2bc..bd374f0 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task.h
+++ b/jingle/notifier/listener/push_notifications_send_update_task.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
 class Jid;
diff --git a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
index 0395352..0e26850 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
+++ b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
@@ -8,8 +8,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task.cc b/jingle/notifier/listener/push_notifications_subscribe_task.cc
index 587f1da..753fc34 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task.cc
+++ b/jingle/notifier/listener/push_notifications_subscribe_task.cc
@@ -10,12 +10,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/xmppengine.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/task.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task.h b/jingle/notifier/listener/push_notifications_subscribe_task.h
index 75ee9e1..a26c5e5 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task.h
+++ b/jingle/notifier/listener/push_notifications_subscribe_task.h
@@ -13,8 +13,8 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
-#include "talk/xmpp/xmpptask.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace notifier {
 class PushNotificationsSubscribeTask : public buzz::XmppTask {
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
index 32522f2..2b72c61 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
+++ b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/jingle/notifier/listener/send_ping_task.cc b/jingle/notifier/listener/send_ping_task.cc
index 317286e..701fa68 100644
--- a/jingle/notifier/listener/send_ping_task.cc
+++ b/jingle/notifier/listener/send_ping_task.cc
@@ -9,11 +9,11 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
-#include "talk/xmpp/xmppclient.h"
 #include "third_party/webrtc/libjingle/xmllite/qname.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace notifier {
 
diff --git a/jingle/notifier/listener/send_ping_task.h b/jingle/notifier/listener/send_ping_task.h
index feccb17..5c980ac 100644
--- a/jingle/notifier/listener/send_ping_task.h
+++ b/jingle/notifier/listener/send_ping_task.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/jingle/notifier/listener/send_ping_task_unittest.cc b/jingle/notifier/listener/send_ping_task_unittest.cc
index 1a2dd4b..caaad38 100644
--- a/jingle/notifier/listener/send_ping_task_unittest.cc
+++ b/jingle/notifier/listener/send_ping_task_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/listener/xml_element_util.h"
-#include "talk/xmpp/jid.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/jingle/notifier/listener/xmpp_push_client.h b/jingle/notifier/listener/xmpp_push_client.h
index dbbd468..ea63eb7 100644
--- a/jingle/notifier/listener/xmpp_push_client.h
+++ b/jingle/notifier/listener/xmpp_push_client.h
@@ -22,7 +22,7 @@
 #include "jingle/notifier/listener/push_notifications_listen_task.h"
 #include "jingle/notifier/listener/push_notifications_subscribe_task.h"
 #include "jingle/notifier/listener/send_ping_task.h"
-#include "talk/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace buzz {
 class XmppTaskParentInterface;
diff --git a/remoting/DEPS b/remoting/DEPS
index 8f52b3e..a1b251d 100644
--- a/remoting/DEPS
+++ b/remoting/DEPS
@@ -17,6 +17,7 @@ include_rules = [
   "+third_party/libyuv",
   "+third_party/webrtc/base",
   "+third_party/webrtc/libjingle",
+  "+third_party/webrtc/p2p",
   "+third_party/webrtc/modules/desktop_capture",
   "+ui/base/keycodes",
 ]
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h
index 6fcf0a4..a03e0d9 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/p2p/base/packetsocketfactory.h"
+#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_port_allocator.h b/remoting/client/plugin/pepper_port_allocator.h
index c6c3de7..c98c242 100644
--- a/remoting/client/plugin/pepper_port_allocator.h
+++ b/remoting/client/plugin/pepper_port_allocator.h
@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/cpp/instance_handle.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
+#include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace remoting {
 
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc
index 11d4ecd..07212bd 100644
--- a/remoting/host/heartbeat_sender.cc
+++ b/remoting/host/heartbeat_sender.cc
@@ -18,8 +18,8 @@
 #include "remoting/signaling/iq_sender.h"
 #include "remoting/signaling/server_log_entry.h"
 #include "remoting/signaling/signal_strategy.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 2760cd4..ccfd353 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -18,8 +18,8 @@
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/host_change_notification_listener.cc b/remoting/host/host_change_notification_listener.cc
index 70584ec..ec49596 100644
--- a/remoting/host/host_change_notification_listener.cc
+++ b/remoting/host/host_change_notification_listener.cc
@@ -11,8 +11,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/jingle_messages.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/host_change_notification_listener_unittest.cc b/remoting/host/host_change_notification_listener_unittest.cc
index ff9e15b..bd5c8dc 100644
--- a/remoting/host/host_change_notification_listener_unittest.cc
+++ b/remoting/host/host_change_notification_listener_unittest.cc
@@ -14,8 +14,8 @@
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/host_status_sender.cc b/remoting/host/host_status_sender.cc
index c93e2eb..667c107 100644
--- a/remoting/host/host_status_sender.cc
+++ b/remoting/host/host_status_sender.cc
@@ -13,8 +13,8 @@
 #include "remoting/signaling/iq_sender.h"
 #include "remoting/signaling/server_log_entry.h"
 #include "remoting/signaling/signal_strategy.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/register_support_host_request.cc b/remoting/host/register_support_host_request.cc
index f8054ff..89e56059 100644
--- a/remoting/host/register_support_host_request.cc
+++ b/remoting/host/register_support_host_request.cc
@@ -13,8 +13,8 @@
 #include "remoting/host/host_config.h"
 #include "remoting/signaling/iq_sender.h"
 #include "remoting/signaling/signal_strategy.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc
index 391d808..9821986 100644
--- a/remoting/host/register_support_host_request_unittest.cc
+++ b/remoting/host/register_support_host_request_unittest.cc
@@ -18,8 +18,8 @@
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/protocol/chromium_port_allocator.h b/remoting/protocol/chromium_port_allocator.h
index 778771d..a2b759c 100644
--- a/remoting/protocol/chromium_port_allocator.h
+++ b/remoting/protocol/chromium_port_allocator.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
+#include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace net {
 class URLRequestContextGetter;
diff --git a/remoting/protocol/chromium_socket_factory.h b/remoting/protocol/chromium_socket_factory.h
index 63d9db7..98ad547 100644
--- a/remoting/protocol/chromium_socket_factory.h
+++ b/remoting/protocol/chromium_socket_factory.h
@@ -6,7 +6,7 @@
 #define REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_
 
 #include "base/compiler_specific.h"
-#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
+#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h
index 5fa88fb..748b0f9 100644
--- a/remoting/protocol/content_description.h
+++ b/remoting/protocol/content_description.h
@@ -7,10 +7,10 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "remoting/protocol/session_config.h"
-#include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
+#include "third_party/webrtc/p2p/base/sessiondescription.h"
 
 namespace buzz {
 class XmlElement;
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
index 828bb57..e12c854 100644
--- a/remoting/protocol/jingle_messages.h
+++ b/remoting/protocol/jingle_messages.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/p2p/base/candidate.h"
 
 
 namespace remoting {
diff --git a/remoting/protocol/jingle_messages_unittest.cc b/remoting/protocol/jingle_messages_unittest.cc
index 0e21577..26a22d1 100644
--- a/remoting/protocol/jingle_messages_unittest.cc
+++ b/remoting/protocol/jingle_messages_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/logging.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlAttr;
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 1778d39..2277ac0 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -23,8 +23,8 @@
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/stream_channel_factory.h"
 #include "remoting/signaling/iq_sender.h"
-#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/p2p/base/candidate.h"
 
 using buzz::XmlElement;
 
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 3b44cf7..b7b8755 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -13,12 +13,12 @@
 #include "net/base/net_errors.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/signaling/jingle_info_request.h"
-#include "third_party/libjingle/source/talk/p2p/base/constants.h"
-#include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
-#include "third_party/libjingle/source/talk/p2p/base/port.h"
-#include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
 #include "third_party/webrtc/base/network.h"
+#include "third_party/webrtc/p2p/base/constants.h"
+#include "third_party/webrtc/p2p/base/p2ptransportchannel.h"
+#include "third_party/webrtc/p2p/base/port.h"
+#include "third_party/webrtc/p2p/client/basicportallocator.h"
+#include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc
index 4815ef5..62c4ead 100644
--- a/remoting/signaling/fake_signal_strategy.cc
+++ b/remoting/signaling/fake_signal_strategy.cc
@@ -11,8 +11,8 @@
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 namespace remoting {
 
diff --git a/remoting/signaling/iq_sender.cc b/remoting/signaling/iq_sender.cc
index c7af213..f277936 100644
--- a/remoting/signaling/iq_sender.cc
+++ b/remoting/signaling/iq_sender.cc
@@ -13,8 +13,8 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "remoting/signaling/signal_strategy.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 namespace remoting {
 
diff --git a/remoting/signaling/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc
index 5c84816..be305cc 100644
--- a/remoting/signaling/iq_sender_unittest.cc
+++ b/remoting/signaling/iq_sender_unittest.cc
@@ -11,8 +11,8 @@
 #include "remoting/signaling/mock_signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using ::testing::_;
 using ::testing::DeleteArg;
diff --git a/remoting/signaling/jingle_info_request.cc b/remoting/signaling/jingle_info_request.cc
index b935eed..2795821 100644
--- a/remoting/signaling/jingle_info_request.cc
+++ b/remoting/signaling/jingle_info_request.cc
@@ -11,9 +11,9 @@
 #include "base/time/time.h"
 #include "net/base/net_util.h"
 #include "remoting/signaling/iq_sender.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/base/socketaddress.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 namespace remoting {
 
diff --git a/remoting/signaling/log_to_server.cc b/remoting/signaling/log_to_server.cc
index 51856b9..dd6d93d 100644
--- a/remoting/signaling/log_to_server.cc
+++ b/remoting/signaling/log_to_server.cc
@@ -7,8 +7,8 @@
 #include "remoting/base/constants.h"
 #include "remoting/signaling/iq_sender.h"
 #include "remoting/signaling/signal_strategy.h"
-#include "third_party/libjingle/source/talk/xmpp/constants.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
+#include "third_party/webrtc/libjingle/xmpp/constants.h"
 
 using buzz::QName;
 using buzz::XmlElement;
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc
index 9b32a63..864ddb7 100644
--- a/remoting/signaling/xmpp_signal_strategy.cc
+++ b/remoting/signaling/xmpp_signal_strategy.cc
@@ -17,9 +17,9 @@
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "third_party/libjingle/source/talk/xmpp/prexmppauth.h"
-#include "third_party/libjingle/source/talk/xmpp/saslcookiemechanism.h"
 #include "third_party/webrtc/base/thread.h"
+#include "third_party/webrtc/libjingle/xmpp/prexmppauth.h"
+#include "third_party/webrtc/libjingle/xmpp/saslcookiemechanism.h"
 
 const char kDefaultResourceName[] = "chromoting";
 
diff --git a/remoting/signaling/xmpp_signal_strategy.h b/remoting/signaling/xmpp_signal_strategy.h
index 2f378bf..5216d77 100644
--- a/remoting/signaling/xmpp_signal_strategy.h
+++ b/remoting/signaling/xmpp_signal_strategy.h
@@ -18,8 +18,8 @@
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
-#include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
 #include "third_party/webrtc/base/sigslot.h"
+#include "third_party/webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace net {
 class ClientSocketFactory;
diff --git a/remoting/test/fake_network_dispatcher.h b/remoting/test/fake_network_dispatcher.h
index 44491a4..fcdfef5 100644
--- a/remoting/test/fake_network_dispatcher.h
+++ b/remoting/test/fake_network_dispatcher.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
+#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
 
 namespace base {
 class SingleThreadTaskRunner;
diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h
index 284dc95..af6ec3f8 100644
--- a/remoting/test/fake_port_allocator.h
+++ b/remoting/test/fake_port_allocator.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
+#include "third_party/webrtc/p2p/client/httpportallocator.h"
 
 namespace remoting {
 
diff --git a/remoting/test/fake_socket_factory.h b/remoting/test/fake_socket_factory.h
index 883a258a..6730e91 100644
--- a/remoting/test/fake_socket_factory.h
+++ b/remoting/test/fake_socket_factory.h
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "remoting/test/fake_network_dispatcher.h"
-#include "third_party/libjingle/source/talk/p2p/base/packetsocketfactory.h"
+#include "third_party/webrtc/p2p/base/packetsocketfactory.h"
 
 namespace remoting {
 
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 7d80631..38f0a02 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -129,124 +129,127 @@ group("jingle_deps") {
 
 # GYP version: third_party/libjingle.gyp:libjingle
 static_library("libjingle") {
+  p2p_dir = "../webrtc/p2p"
+  xmllite_dir = "../webrtc/libjingle/xmllite"
+  xmpp_dir = "../webrtc/libjingle/xmpp"
   sources = [
     # List from third_party/libjingle/libjingle_common.gypi
-    "source/talk/p2p/base/asyncstuntcpsocket.cc",
-    "source/talk/p2p/base/asyncstuntcpsocket.h",
-    "source/talk/p2p/base/basicpacketsocketfactory.cc",
-    "source/talk/p2p/base/basicpacketsocketfactory.h",
-    "source/talk/p2p/base/candidate.h",
-    "source/talk/p2p/base/common.h",
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
-    "source/talk/p2p/base/dtlstransport.h",
-    "source/talk/p2p/base/dtlstransportchannel.cc",
-    "source/talk/p2p/base/dtlstransportchannel.h",
-    "source/talk/p2p/base/p2ptransport.cc",
-    "source/talk/p2p/base/p2ptransport.h",
-    "source/talk/p2p/base/p2ptransportchannel.cc",
-    "source/talk/p2p/base/p2ptransportchannel.h",
-    "source/talk/p2p/base/parsing.cc",
-    "source/talk/p2p/base/parsing.h",
-    "source/talk/p2p/base/port.cc",
-    "source/talk/p2p/base/port.h",
-    "source/talk/p2p/base/portallocator.cc",
-    "source/talk/p2p/base/portallocator.h",
-    "source/talk/p2p/base/portallocatorsessionproxy.cc",
-    "source/talk/p2p/base/portallocatorsessionproxy.h",
-    "source/talk/p2p/base/portproxy.cc",
-    "source/talk/p2p/base/portproxy.h",
-    "source/talk/p2p/base/pseudotcp.cc",
-    "source/talk/p2p/base/pseudotcp.h",
-    "source/talk/p2p/base/rawtransport.cc",
-    "source/talk/p2p/base/rawtransport.h",
-    "source/talk/p2p/base/rawtransportchannel.cc",
-    "source/talk/p2p/base/rawtransportchannel.h",
-    "source/talk/p2p/base/relayport.cc",
-    "source/talk/p2p/base/relayport.h",
-    "source/talk/p2p/base/session.cc",
-    "source/talk/p2p/base/session.h",
-    "source/talk/p2p/base/sessionclient.h",
-    "source/talk/p2p/base/sessiondescription.cc",
-    "source/talk/p2p/base/sessiondescription.h",
-    "source/talk/p2p/base/sessionid.h",
-    "source/talk/p2p/base/sessionmanager.cc",
-    "source/talk/p2p/base/sessionmanager.h",
-    "source/talk/p2p/base/sessionmessages.cc",
-    "source/talk/p2p/base/sessionmessages.h",
-    "source/talk/p2p/base/stun.cc",
-    "source/talk/p2p/base/stun.h",
-    "source/talk/p2p/base/stunport.cc",
-    "source/talk/p2p/base/stunport.h",
-    "source/talk/p2p/base/stunrequest.cc",
-    "source/talk/p2p/base/stunrequest.h",
-    "source/talk/p2p/base/tcpport.cc",
-    "source/talk/p2p/base/tcpport.h",
-    "source/talk/p2p/base/transport.cc",
-    "source/talk/p2p/base/transport.h",
-    "source/talk/p2p/base/transportchannel.cc",
-    "source/talk/p2p/base/transportchannel.h",
-    "source/talk/p2p/base/transportchannelimpl.h",
-    "source/talk/p2p/base/transportchannelproxy.cc",
-    "source/talk/p2p/base/transportchannelproxy.h",
-    "source/talk/p2p/base/transportdescription.cc",
-    "source/talk/p2p/base/transportdescription.h",
-    "source/talk/p2p/base/transportdescriptionfactory.cc",
-    "source/talk/p2p/base/transportdescriptionfactory.h",
-    "source/talk/p2p/base/turnport.cc",
-    "source/talk/p2p/base/turnport.h",
-    "source/talk/p2p/client/basicportallocator.cc",
-    "source/talk/p2p/client/basicportallocator.h",
-    "source/talk/p2p/client/httpportallocator.cc",
-    "source/talk/p2p/client/httpportallocator.h",
-    "source/talk/p2p/client/sessionmanagertask.h",
-    "source/talk/p2p/client/sessionsendtask.h",
-    "source/talk/p2p/client/socketmonitor.cc",
-    "source/talk/p2p/client/socketmonitor.h",
-    "source/talk/xmllite/qname.cc",
-    "source/talk/xmllite/qname.h",
-    "source/talk/xmllite/xmlbuilder.cc",
-    "source/talk/xmllite/xmlbuilder.h",
-    "source/talk/xmllite/xmlconstants.cc",
-    "source/talk/xmllite/xmlconstants.h",
-    "source/talk/xmllite/xmlelement.cc",
-    "source/talk/xmllite/xmlelement.h",
-    "source/talk/xmllite/xmlnsstack.cc",
-    "source/talk/xmllite/xmlnsstack.h",
-    "source/talk/xmllite/xmlparser.cc",
-    "source/talk/xmllite/xmlparser.h",
-    "source/talk/xmllite/xmlprinter.cc",
-    "source/talk/xmllite/xmlprinter.h",
-    "source/talk/xmpp/asyncsocket.h",
-    "source/talk/xmpp/constants.cc",
-    "source/talk/xmpp/constants.h",
-    "source/talk/xmpp/jid.cc",
-    "source/talk/xmpp/jid.h",
-    "source/talk/xmpp/plainsaslhandler.h",
-    "source/talk/xmpp/prexmppauth.h",
-    "source/talk/xmpp/saslcookiemechanism.h",
-    "source/talk/xmpp/saslhandler.h",
-    "source/talk/xmpp/saslmechanism.cc",
-    "source/talk/xmpp/saslmechanism.h",
-    "source/talk/xmpp/saslplainmechanism.h",
-    "source/talk/xmpp/xmppclient.cc",
-    "source/talk/xmpp/xmppclient.h",
-    "source/talk/xmpp/xmppclientsettings.h",
-    "source/talk/xmpp/xmppengine.h",
-    "source/talk/xmpp/xmppengineimpl.cc",
-    "source/talk/xmpp/xmppengineimpl.h",
-    "source/talk/xmpp/xmppengineimpl_iq.cc",
-    "source/talk/xmpp/xmpplogintask.cc",
-    "source/talk/xmpp/xmpplogintask.h",
-    "source/talk/xmpp/xmppstanzaparser.cc",
-    "source/talk/xmpp/xmppstanzaparser.h",
-    "source/talk/xmpp/xmpptask.cc",
-    "source/talk/xmpp/xmpptask.h",
+    "$p2p_dir/base/asyncstuntcpsocket.cc",
+    "$p2p_dir/base/asyncstuntcpsocket.h",
+    "$p2p_dir/base/basicpacketsocketfactory.cc",
+    "$p2p_dir/base/basicpacketsocketfactory.h",
+    "$p2p_dir/base/candidate.h",
+    "$p2p_dir/base/common.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
+    "$p2p_dir/base/dtlstransport.h",
+    "$p2p_dir/base/dtlstransportchannel.cc",
+    "$p2p_dir/base/dtlstransportchannel.h",
+    "$p2p_dir/base/p2ptransport.cc",
+    "$p2p_dir/base/p2ptransport.h",
+    "$p2p_dir/base/p2ptransportchannel.cc",
+    "$p2p_dir/base/p2ptransportchannel.h",
+    "$p2p_dir/base/parsing.cc",
+    "$p2p_dir/base/parsing.h",
+    "$p2p_dir/base/port.cc",
+    "$p2p_dir/base/port.h",
+    "$p2p_dir/base/portallocator.cc",
+    "$p2p_dir/base/portallocator.h",
+    "$p2p_dir/base/portallocatorsessionproxy.cc",
+    "$p2p_dir/base/portallocatorsessionproxy.h",
+    "$p2p_dir/base/portproxy.cc",
+    "$p2p_dir/base/portproxy.h",
+    "$p2p_dir/base/pseudotcp.cc",
+    "$p2p_dir/base/pseudotcp.h",
+    "$p2p_dir/base/rawtransport.cc",
+    "$p2p_dir/base/rawtransport.h",
+    "$p2p_dir/base/rawtransportchannel.cc",
+    "$p2p_dir/base/rawtransportchannel.h",
+    "$p2p_dir/base/relayport.cc",
+    "$p2p_dir/base/relayport.h",
+    "$p2p_dir/base/session.cc",
+    "$p2p_dir/base/session.h",
+    "$p2p_dir/base/sessionclient.h",
+    "$p2p_dir/base/sessiondescription.cc",
+    "$p2p_dir/base/sessiondescription.h",
+    "$p2p_dir/base/sessionid.h",
+    "$p2p_dir/base/sessionmanager.cc",
+    "$p2p_dir/base/sessionmanager.h",
+    "$p2p_dir/base/sessionmessages.cc",
+    "$p2p_dir/base/sessionmessages.h",
+    "$p2p_dir/base/stun.cc",
+    "$p2p_dir/base/stun.h",
+    "$p2p_dir/base/stunport.cc",
+    "$p2p_dir/base/stunport.h",
+    "$p2p_dir/base/stunrequest.cc",
+    "$p2p_dir/base/stunrequest.h",
+    "$p2p_dir/base/tcpport.cc",
+    "$p2p_dir/base/tcpport.h",
+    "$p2p_dir/base/transport.cc",
+    "$p2p_dir/base/transport.h",
+    "$p2p_dir/base/transportchannel.cc",
+    "$p2p_dir/base/transportchannel.h",
+    "$p2p_dir/base/transportchannelimpl.h",
+    "$p2p_dir/base/transportchannelproxy.cc",
+    "$p2p_dir/base/transportchannelproxy.h",
+    "$p2p_dir/base/transportdescription.cc",
+    "$p2p_dir/base/transportdescription.h",
+    "$p2p_dir/base/transportdescriptionfactory.cc",
+    "$p2p_dir/base/transportdescriptionfactory.h",
+    "$p2p_dir/base/turnport.cc",
+    "$p2p_dir/base/turnport.h",
+    "$p2p_dir/client/basicportallocator.cc",
+    "$p2p_dir/client/basicportallocator.h",
+    "$p2p_dir/client/httpportallocator.cc",
+    "$p2p_dir/client/httpportallocator.h",
+    "$p2p_dir/client/sessionmanagertask.h",
+    "$p2p_dir/client/sessionsendtask.h",
+    "$p2p_dir/client/socketmonitor.cc",
+    "$p2p_dir/client/socketmonitor.h",
+    "$xmllite_dir/qname.cc",
+    "$xmllite_dir/qname.h",
+    "$xmllite_dir/xmlbuilder.cc",
+    "$xmllite_dir/xmlbuilder.h",
+    "$xmllite_dir/xmlconstants.cc",
+    "$xmllite_dir/xmlconstants.h",
+    "$xmllite_dir/xmlelement.cc",
+    "$xmllite_dir/xmlelement.h",
+    "$xmllite_dir/xmlnsstack.cc",
+    "$xmllite_dir/xmlnsstack.h",
+    "$xmllite_dir/xmlparser.cc",
+    "$xmllite_dir/xmlparser.h",
+    "$xmllite_dir/xmlprinter.cc",
+    "$xmllite_dir/xmlprinter.h",
+    "$xmpp_dir/asyncsocket.h",
+    "$xmpp_dir/constants.cc",
+    "$xmpp_dir/constants.h",
+    "$xmpp_dir/jid.cc",
+    "$xmpp_dir/jid.h",
+    "$xmpp_dir/plainsaslhandler.h",
+    "$xmpp_dir/prexmppauth.h",
+    "$xmpp_dir/saslcookiemechanism.h",
+    "$xmpp_dir/saslhandler.h",
+    "$xmpp_dir/saslmechanism.cc",
+    "$xmpp_dir/saslmechanism.h",
+    "$xmpp_dir/saslplainmechanism.h",
+    "$xmpp_dir/xmppclient.cc",
+    "$xmpp_dir/xmppclient.h",
+    "$xmpp_dir/xmppclientsettings.h",
+    "$xmpp_dir/xmppengine.h",
+    "$xmpp_dir/xmppengineimpl.cc",
+    "$xmpp_dir/xmppengineimpl.h",
+    "$xmpp_dir/xmppengineimpl_iq.cc",
+    "$xmpp_dir/xmpplogintask.cc",
+    "$xmpp_dir/xmpplogintask.h",
+    "$xmpp_dir/xmppstanzaparser.cc",
+    "$xmpp_dir/xmppstanzaparser.h",
+    "$xmpp_dir/xmpptask.cc",
+    "$xmpp_dir/xmpptask.h",
   ]
   sources -= [
     # Compiled as part of libjingle_p2p_constants.
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
   ]
   public_deps = [
     ":jingle_deps"
@@ -282,9 +285,10 @@ static_library("libjingle") {
 #
 # GYP version: third_party/libjingle.gyp:libjingle_p2p_constants
 static_library("libjingle_p2p_constants") {
+  p2p_dir = "../webrtc/p2p"
   sources = [
-    "source/talk/p2p/base/constants.cc",
-    "source/talk/p2p/base/constants.h",
+    "$p2p_dir/base/constants.cc",
+    "$p2p_dir/base/constants.h",
   ]
   public_deps = [
     ":jingle_deps",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 70a05ad..41c781e 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/webrtc/
 Version: unknown
-Revision: 7546
+Revision: 7549
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 801d14346..1a1619b 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -268,37 +268,15 @@
     # GN version: //third_party/libjingle
     {
       'target_name': 'libjingle',
-      'type': 'static_library',
-      'includes': [ 'libjingle_common.gypi' ],
-      'sources!' : [
-        # Compiled as part of libjingle_p2p_constants.
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
+      'type': 'none',
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        'libjingle_p2p_constants',
+        '<(DEPTH)/third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
+        '<(DEPTH)/third_party/webrtc/p2p/p2p.gyp:rtc_p2p',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS 2008 and the
-    # current toolset on android.  The problem is that we have two files named
-    # "constants.cc" and MSVS/android doesn't handle this properly.
-    # GYP currently has guards to catch this, so if you want to remove it,
-    # run GYP and if GYP has removed the validation check, then we can assume
-    # that the toolchains have been fixed (we currently use VS2010 and later,
-    # so VS2008 isn't a concern anymore).
-    #
-    # GN version: //third_party/libjingle:libjingle_p2p_constants
-    {
-      'target_name': 'libjingle_p2p_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
-    },  # target libjingle_p2p_constants
     # GN version: //third_party/libjingle:peerconnection_server
     {
       'target_name': 'peerconnection_server',
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
deleted file mode 100644
index eb9cbe6..0000000
--- a/third_party/libjingle/libjingle_common.gypi
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'nacl_untrusted_build%': 0,
-  },
-  'sources': [
-    '<(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/constants.cc',
-    '<(libjingle_source)/talk/p2p/base/constants.h',
-    '<(libjingle_source)/talk/p2p/base/dtlstransport.h',
-    '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/dtlstransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/p2ptransport.cc',
-    '<(libjingle_source)/talk/p2p/base/p2ptransport.h',
-    '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/p2ptransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/parsing.cc',
-    '<(libjingle_source)/talk/p2p/base/parsing.h',
-    '<(libjingle_source)/talk/p2p/base/port.cc',
-    '<(libjingle_source)/talk/p2p/base/port.h',
-    '<(libjingle_source)/talk/p2p/base/portallocator.cc',
-    '<(libjingle_source)/talk/p2p/base/portallocator.h',
-    '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/portallocatorsessionproxy.h',
-    '<(libjingle_source)/talk/p2p/base/portproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/portproxy.h',
-    '<(libjingle_source)/talk/p2p/base/pseudotcp.cc',
-    '<(libjingle_source)/talk/p2p/base/pseudotcp.h',
-    '<(libjingle_source)/talk/p2p/base/rawtransport.cc',
-    '<(libjingle_source)/talk/p2p/base/rawtransport.h',
-    '<(libjingle_source)/talk/p2p/base/rawtransportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/rawtransportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/relayport.cc',
-    '<(libjingle_source)/talk/p2p/base/relayport.h',
-    '<(libjingle_source)/talk/p2p/base/session.cc',
-    '<(libjingle_source)/talk/p2p/base/session.h',
-    '<(libjingle_source)/talk/p2p/base/sessionclient.h',
-    '<(libjingle_source)/talk/p2p/base/sessiondescription.cc',
-    '<(libjingle_source)/talk/p2p/base/sessiondescription.h',
-    '<(libjingle_source)/talk/p2p/base/sessionid.h',
-    '<(libjingle_source)/talk/p2p/base/sessionmanager.cc',
-    '<(libjingle_source)/talk/p2p/base/sessionmanager.h',
-    '<(libjingle_source)/talk/p2p/base/sessionmessages.cc',
-    '<(libjingle_source)/talk/p2p/base/sessionmessages.h',
-    '<(libjingle_source)/talk/p2p/base/stun.cc',
-    '<(libjingle_source)/talk/p2p/base/stun.h',
-    '<(libjingle_source)/talk/p2p/base/stunport.cc',
-    '<(libjingle_source)/talk/p2p/base/stunport.h',
-    '<(libjingle_source)/talk/p2p/base/stunrequest.cc',
-    '<(libjingle_source)/talk/p2p/base/stunrequest.h',
-    '<(libjingle_source)/talk/p2p/base/tcpport.cc',
-    '<(libjingle_source)/talk/p2p/base/tcpport.h',
-    '<(libjingle_source)/talk/p2p/base/transport.cc',
-    '<(libjingle_source)/talk/p2p/base/transport.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannel.cc',
-    '<(libjingle_source)/talk/p2p/base/transportchannel.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h',
-    '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc',
-    '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h',
-    '<(libjingle_source)/talk/p2p/base/transportdescription.cc',
-    '<(libjingle_source)/talk/p2p/base/transportdescription.h',
-    '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc',
-    '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h',
-    '<(libjingle_source)/talk/p2p/base/turnport.cc',
-    '<(libjingle_source)/talk/p2p/base/turnport.h',
-    '<(libjingle_source)/talk/p2p/client/basicportallocator.cc',
-    '<(libjingle_source)/talk/p2p/client/basicportallocator.h',
-    '<(libjingle_source)/talk/p2p/client/httpportallocator.cc',
-    '<(libjingle_source)/talk/p2p/client/httpportallocator.h',
-    '<(libjingle_source)/talk/p2p/client/sessionmanagertask.h',
-    '<(libjingle_source)/talk/p2p/client/sessionsendtask.h',
-    '<(libjingle_source)/talk/p2p/client/socketmonitor.cc',
-    '<(libjingle_source)/talk/p2p/client/socketmonitor.h',
-    '<(libjingle_source)/talk/xmpp/asyncsocket.h',
-    '<(libjingle_source)/talk/xmpp/constants.cc',
-    '<(libjingle_source)/talk/xmpp/constants.h',
-    '<(libjingle_source)/talk/xmpp/jid.cc',
-    '<(libjingle_source)/talk/xmpp/jid.h',
-    '<(libjingle_source)/talk/xmpp/plainsaslhandler.h',
-    '<(libjingle_source)/talk/xmpp/prexmppauth.h',
-    '<(libjingle_source)/talk/xmpp/saslcookiemechanism.h',
-    '<(libjingle_source)/talk/xmpp/saslhandler.h',
-    '<(libjingle_source)/talk/xmpp/saslmechanism.cc',
-    '<(libjingle_source)/talk/xmpp/saslmechanism.h',
-    '<(libjingle_source)/talk/xmpp/saslplainmechanism.h',
-    '<(libjingle_source)/talk/xmpp/xmppclient.cc',
-    '<(libjingle_source)/talk/xmpp/xmppclient.h',
-    '<(libjingle_source)/talk/xmpp/xmppclientsettings.h',
-    '<(libjingle_source)/talk/xmpp/xmppengine.h',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl.cc',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl.h',
-    '<(libjingle_source)/talk/xmpp/xmppengineimpl_iq.cc',
-    '<(libjingle_source)/talk/xmpp/xmpplogintask.cc',
-    '<(libjingle_source)/talk/xmpp/xmpplogintask.h',
-    '<(libjingle_source)/talk/xmpp/xmppstanzaparser.cc',
-    '<(libjingle_source)/talk/xmpp/xmppstanzaparser.h',
-    '<(libjingle_source)/talk/xmpp/xmpptask.cc',
-    '<(libjingle_source)/talk/xmpp/xmpptask.h',
-  ],
-  'conditions': [
-    ['OS=="win" and nacl_untrusted_build==0', {
-      # Suppress warnings about WIN32_LEAN_AND_MEAN.
-      'msvs_disabled_warnings': [ 4005, 4267 ],
-    }, {
-      'sources/': [
-        ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
-        ['exclude', '/schanneladapter\\.(h|cc)$'],
-      ],
-    }],
-    ['os_posix!=1 and nacl_untrusted_build==0', {
-      'sources/': [
-        ['exclude', '/unix[a-z]+\\.(h|cc)$'],
-      ],
-    }],
-    ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
-      'sources/': [
-        ['exclude', '/mac[a-z]+\\.(h|cc)$'],
-        ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
-      ],
-    }],
-    ['use_openssl!=1', {
-      'sources/': [
-        ['exclude', '/openssl[a-z]+\\.(h|cc)$'],
-      ],
-    }],
-  ],
-}
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
index 9c474ef..a1db4b7 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -6,7 +6,9 @@
   'variables': {
     'libjingle_source': "source",
     'webrtc_base': "../webrtc/base",
+    'webrtc_p2p': "../webrtc/p2p",
     'webrtc_xmllite': "../webrtc/libjingle/xmllite",
+    'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
   'includes': [
     '../../native_client/build/untrusted.gypi',
@@ -57,7 +59,6 @@
         './<(libjingle_source)',
         '../',
       ],
-      'includes': ['libjingle_common.gypi', ],
       'sources': [
         '<(webrtc_base)/asyncfile.cc',
         '<(webrtc_base)/asyncfile.h',
@@ -231,6 +232,78 @@
         '<(webrtc_base)/winping.h',
         '<(webrtc_base)/worker.cc',
         '<(webrtc_base)/worker.h',
+        '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
+        '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
+        '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
+        '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
+        '<(webrtc_p2p)/base/candidate.h',
+        '<(webrtc_p2p)/base/common.h',
+        '<(webrtc_p2p)/base/constants.cc',
+        '<(webrtc_p2p)/base/constants.h',
+        '<(webrtc_p2p)/base/dtlstransport.h',
+        '<(webrtc_p2p)/base/dtlstransportchannel.cc',
+        '<(webrtc_p2p)/base/dtlstransportchannel.h',
+        '<(webrtc_p2p)/base/p2ptransport.cc',
+        '<(webrtc_p2p)/base/p2ptransport.h',
+        '<(webrtc_p2p)/base/p2ptransportchannel.cc',
+        '<(webrtc_p2p)/base/p2ptransportchannel.h',
+        '<(webrtc_p2p)/base/parsing.cc',
+        '<(webrtc_p2p)/base/parsing.h',
+        '<(webrtc_p2p)/base/port.cc',
+        '<(webrtc_p2p)/base/port.h',
+        '<(webrtc_p2p)/base/portallocator.cc',
+        '<(webrtc_p2p)/base/portallocator.h',
+        '<(webrtc_p2p)/base/portallocatorsessionproxy.cc',
+        '<(webrtc_p2p)/base/portallocatorsessionproxy.h',
+        '<(webrtc_p2p)/base/portproxy.cc',
+        '<(webrtc_p2p)/base/portproxy.h',
+        '<(webrtc_p2p)/base/pseudotcp.cc',
+        '<(webrtc_p2p)/base/pseudotcp.h',
+        '<(webrtc_p2p)/base/rawtransport.cc',
+        '<(webrtc_p2p)/base/rawtransport.h',
+        '<(webrtc_p2p)/base/rawtransportchannel.cc',
+        '<(webrtc_p2p)/base/rawtransportchannel.h',
+        '<(webrtc_p2p)/base/relayport.cc',
+        '<(webrtc_p2p)/base/relayport.h',
+        '<(webrtc_p2p)/base/session.cc',
+        '<(webrtc_p2p)/base/session.h',
+        '<(webrtc_p2p)/base/sessionclient.h',
+        '<(webrtc_p2p)/base/sessiondescription.cc',
+        '<(webrtc_p2p)/base/sessiondescription.h',
+        '<(webrtc_p2p)/base/sessionid.h',
+        '<(webrtc_p2p)/base/sessionmanager.cc',
+        '<(webrtc_p2p)/base/sessionmanager.h',
+        '<(webrtc_p2p)/base/sessionmessages.cc',
+        '<(webrtc_p2p)/base/sessionmessages.h',
+        '<(webrtc_p2p)/base/stun.cc',
+        '<(webrtc_p2p)/base/stun.h',
+        '<(webrtc_p2p)/base/stunport.cc',
+        '<(webrtc_p2p)/base/stunport.h',
+        '<(webrtc_p2p)/base/stunrequest.cc',
+        '<(webrtc_p2p)/base/stunrequest.h',
+        '<(webrtc_p2p)/base/tcpport.cc',
+        '<(webrtc_p2p)/base/tcpport.h',
+        '<(webrtc_p2p)/base/transport.cc',
+        '<(webrtc_p2p)/base/transport.h',
+        '<(webrtc_p2p)/base/transportchannel.cc',
+        '<(webrtc_p2p)/base/transportchannel.h',
+        '<(webrtc_p2p)/base/transportchannelimpl.h',
+        '<(webrtc_p2p)/base/transportchannelproxy.cc',
+        '<(webrtc_p2p)/base/transportchannelproxy.h',
+        '<(webrtc_p2p)/base/transportdescription.cc',
+        '<(webrtc_p2p)/base/transportdescription.h',
+        '<(webrtc_p2p)/base/transportdescriptionfactory.cc',
+        '<(webrtc_p2p)/base/transportdescriptionfactory.h',
+        '<(webrtc_p2p)/base/turnport.cc',
+        '<(webrtc_p2p)/base/turnport.h',
+        '<(webrtc_p2p)/client/basicportallocator.cc',
+        '<(webrtc_p2p)/client/basicportallocator.h',
+        '<(webrtc_p2p)/client/httpportallocator.cc',
+        '<(webrtc_p2p)/client/httpportallocator.h',
+        '<(webrtc_p2p)/client/sessionmanagertask.h',
+        '<(webrtc_p2p)/client/sessionsendtask.h',
+        '<(webrtc_p2p)/client/socketmonitor.cc',
+        '<(webrtc_p2p)/client/socketmonitor.h',
         '<(webrtc_xmllite)/qname.cc',
         '<(webrtc_xmllite)/qname.h',
         '<(webrtc_xmllite)/xmlbuilder.cc',
@@ -245,6 +318,31 @@
         '<(webrtc_xmllite)/xmlparser.h',
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
+        '<(webrtc_xmpp)/asyncsocket.h',
+        '<(webrtc_xmpp)/constants.cc',
+        '<(webrtc_xmpp)/constants.h',
+        '<(webrtc_xmpp)/jid.cc',
+        '<(webrtc_xmpp)/jid.h',
+        '<(webrtc_xmpp)/plainsaslhandler.h',
+        '<(webrtc_xmpp)/prexmppauth.h',
+        '<(webrtc_xmpp)/saslcookiemechanism.h',
+        '<(webrtc_xmpp)/saslhandler.h',
+        '<(webrtc_xmpp)/saslmechanism.cc',
+        '<(webrtc_xmpp)/saslmechanism.h',
+        '<(webrtc_xmpp)/saslplainmechanism.h',
+        '<(webrtc_xmpp)/xmppclient.cc',
+        '<(webrtc_xmpp)/xmppclient.h',
+        '<(webrtc_xmpp)/xmppclientsettings.h',
+        '<(webrtc_xmpp)/xmppengine.h',
+        '<(webrtc_xmpp)/xmppengineimpl.cc',
+        '<(webrtc_xmpp)/xmppengineimpl.h',
+        '<(webrtc_xmpp)/xmppengineimpl_iq.cc',
+        '<(webrtc_xmpp)/xmpplogintask.cc',
+        '<(webrtc_xmpp)/xmpplogintask.h',
+        '<(webrtc_xmpp)/xmppstanzaparser.cc',
+        '<(webrtc_xmpp)/xmppstanzaparser.h',
+        '<(webrtc_xmpp)/xmpptask.cc',
+        '<(webrtc_xmpp)/xmpptask.h',
       ],
       'sources!': [
         # Compiled as part of libjingle_p2p_constants_nacl.
@@ -254,14 +352,8 @@
       'sources/': [
         ['exclude', '/mac[a-z]+\\.(h|cc)$'],
         ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
-      ],
-      'conditions': [
-        ['OS!="win"', {
-          'sources/': [
-            ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
-            ['exclude', '/schanneladapter\\.(h|cc)$'],
-          ],
-        }],
+        ['exclude', '/schanneladapter\\.(h|cc)$'],
+        ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
       ],
       'direct_dependent_settings': {
         'include_dirs': [