move xmpp and p2p to webrtc

Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and
webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder.

BUG=3379

Review URL: https://webrtc-codereview.appspot.com/26999004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/app/webrtc/fakeportallocatorfactory.h

@@ -32,7 +32,7 @@
 #define TALK_APP_WEBRTC_FAKEPORTALLOCATORFACTORY_H_
 
 #include "talk/app/webrtc/peerconnectioninterface.h"
-#include "talk/p2p/client/fakeportallocator.h"
+#include "webrtc/p2p/client/fakeportallocator.h"
 
 namespace webrtc {
 

talk/app/webrtc/jsepicecandidate.h

@@ -33,7 +33,7 @@
 #include <string>
 
 #include "talk/app/webrtc/jsep.h"
-#include "talk/p2p/base/candidate.h"
+#include "webrtc/p2p/base/candidate.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace webrtc {

talk/app/webrtc/jsepsessiondescription_unittest.cc

@@ -29,9 +29,9 @@
 
 #include "talk/app/webrtc/jsepicecandidate.h"
 #include "talk/app/webrtc/jsepsessiondescription.h"
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"

talk/app/webrtc/mediastreamsignaling_unittest.cc

@@ -38,8 +38,8 @@
 #include "talk/app/webrtc/videotrack.h"
 #include "talk/media/base/fakemediaengine.h"
 #include "talk/media/devices/fakedevicemanager.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"

talk/app/webrtc/peerconnection.cc

@@ -35,7 +35,7 @@
 #include "talk/app/webrtc/mediaconstraintsinterface.h"
 #include "talk/app/webrtc/mediastreamhandler.h"
 #include "talk/app/webrtc/streamcollection.h"
-#include "talk/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/client/basicportallocator.h"
 #include "talk/session/media/channelmanager.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"

talk/app/webrtc/peerconnection_unittest.cc

@@ -46,8 +46,8 @@
 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
 #include "talk/app/webrtc/videosourceinterface.h"
 #include "talk/media/webrtc/fakewebrtcvideoengine.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"

talk/app/webrtc/portallocatorfactory.cc

@@ -27,8 +27,8 @@
 
 #include "talk/app/webrtc/portallocatorfactory.h"
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/client/basicportallocator.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/thread.h"

talk/app/webrtc/statscollector_unittest.cc

@@ -35,7 +35,7 @@
 #include "talk/app/webrtc/videotrack.h"
 #include "talk/media/base/fakemediaengine.h"
 #include "talk/media/devices/fakedevicemanager.h"
-#include "talk/p2p/base/fakesession.h"
+#include "webrtc/p2p/base/fakesession.h"
 #include "talk/session/media/channelmanager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

talk/app/webrtc/webrtcsdp.cc

@@ -39,9 +39,9 @@
 #include "talk/media/base/constants.h"
 #include "talk/media/base/cryptoparams.h"
 #include "talk/media/sctp/sctpdataengine.h"
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/port.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/port.h"
 #include "talk/session/media/mediasession.h"
 #include "talk/session/media/mediasessionclient.h"
 #include "webrtc/base/common.h"

talk/app/webrtc/webrtcsdp_unittest.cc

@@ -32,7 +32,7 @@
 #include "talk/app/webrtc/jsepsessiondescription.h"
 #include "talk/app/webrtc/webrtcsdp.h"
 #include "talk/media/base/constants.h"
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"

talk/app/webrtc/webrtcsession.h

@@ -36,7 +36,7 @@
 #include "talk/app/webrtc/peerconnectioninterface.h"
 #include "talk/app/webrtc/statstypes.h"
 #include "talk/media/base/mediachannel.h"
-#include "talk/p2p/base/session.h"
+#include "webrtc/p2p/base/session.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"

talk/app/webrtc/webrtcsession_unittest.cc

@@ -40,10 +40,10 @@
 #include "talk/media/base/fakevideorenderer.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/devices/fakedevicemanager.h"
-#include "talk/p2p/base/stunserver.h"
-#include "talk/p2p/base/teststunserver.h"
-#include "talk/p2p/base/testturnserver.h"
-#include "talk/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/base/stunserver.h"
+#include "webrtc/p2p/base/teststunserver.h"
+#include "webrtc/p2p/base/testturnserver.h"
+#include "webrtc/p2p/client/basicportallocator.h"
 #include "talk/session/media/channelmanager.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/fakenetwork.h"

talk/app/webrtc/webrtcsessiondescriptionfactory.h

@@ -29,7 +29,7 @@
 #define TALK_APP_WEBRTC_WEBRTCSESSIONDESCRIPTIONFACTORY_H_
 
 #include "talk/app/webrtc/peerconnectioninterface.h"
-#include "talk/p2p/base/transportdescriptionfactory.h"
+#include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/messagehandler.h"
 

talk/examples/call/call_main.cc

@@ -41,13 +41,13 @@
 #include "talk/examples/call/callclient.h"
 #include "talk/examples/call/console.h"
 #include "talk/examples/call/mediaenginefactory.h"
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 #include "talk/session/media/mediasessionclient.h"
 #include "talk/session/media/srtpfilter.h"
-#include "talk/xmpp/xmppauth.h"
-#include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/xmpppump.h"
-#include "talk/xmpp/xmppsocket.h"
+#include "webrtc/libjingle/xmpp/xmppauth.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmpppump.h"
+#include "webrtc/libjingle/xmpp/xmppsocket.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/stream.h"

talk/examples/call/callclient.cc

@@ -53,17 +53,17 @@
 #include "talk/media/base/videorenderer.h"
 #include "talk/media/devices/devicemanager.h"
 #include "talk/media/devices/videorendererfactory.h"
-#include "talk/p2p/base/sessionmanager.h"
-#include "talk/p2p/client/basicportallocator.h"
-#include "talk/p2p/client/sessionmanagertask.h"
+#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/client/sessionmanagertask.h"
 #include "talk/session/media/mediamessages.h"
 #include "talk/session/media/mediasessionclient.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/hangoutpubsubclient.h"
-#include "talk/xmpp/mucroomconfigtask.h"
-#include "talk/xmpp/mucroomlookuptask.h"
-#include "talk/xmpp/pingtask.h"
-#include "talk/xmpp/presenceouttask.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
+#include "webrtc/libjingle/xmpp/mucroomconfigtask.h"
+#include "webrtc/libjingle/xmpp/mucroomlookuptask.h"
+#include "webrtc/libjingle/xmpp/pingtask.h"
+#include "webrtc/libjingle/xmpp/presenceouttask.h"
 
 namespace {
 

talk/examples/call/callclient.h

@@ -34,12 +34,12 @@
 
 #include "talk/examples/call/console.h"
 #include "talk/media/base/mediachannel.h"
-#include "talk/p2p/base/session.h"
+#include "webrtc/p2p/base/session.h"
 #include "talk/session/media/mediamessages.h"
 #include "talk/session/media/mediasessionclient.h"
-#include "talk/xmpp/hangoutpubsubclient.h"
-#include "talk/xmpp/presencestatus.h"
-#include "talk/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
+#include "webrtc/libjingle/xmpp/presencestatus.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslidentity.h"
 

talk/examples/call/callclient_unittest.cc

@@ -30,7 +30,7 @@
 #include "talk/examples/call/callclient.h"
 #include "talk/media/base/filemediaengine.h"
 #include "talk/media/base/mediaengine.h"
-#include "talk/xmpp/xmppthread.h"
+#include "webrtc/libjingle/xmpp/xmppthread.h"
 #include "webrtc/base/gunit.h"
 
 TEST(CallClientTest, CreateCallClientWithDefaultMediaEngine) {

talk/examples/call/friendinvitesendtask.cc

@@ -26,7 +26,7 @@
  */
 
 #include "talk/examples/call/friendinvitesendtask.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 
 namespace buzz {
 

talk/examples/call/friendinvitesendtask.h

@@ -28,8 +28,8 @@
 #ifndef _FRIENDINVITESENDTASK_H_
 #define _FRIENDINVITESENDTASK_H_
 
-#include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
 

talk/examples/call/muc.h

@@ -29,8 +29,8 @@
 #define _MUC_H_
 
 #include <map>
-#include "talk/xmpp/jid.h"
-#include "talk/xmpp/presencestatus.h"
+#include "webrtc/libjingle/xmpp/jid.h"
+#include "webrtc/libjingle/xmpp/presencestatus.h"
 
 namespace buzz {
 

talk/examples/call/mucinviterecvtask.cc

@@ -26,7 +26,7 @@
  */
 
 #include "talk/examples/call/mucinviterecvtask.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 
 namespace buzz {
 

talk/examples/call/mucinviterecvtask.h

@@ -30,8 +30,8 @@
 
 #include <vector>
 
-#include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 #include "webrtc/base/sigslot.h"
 
 namespace buzz {

talk/examples/call/mucinvitesendtask.cc

@@ -26,8 +26,8 @@
  */
 
 #include "talk/examples/call/mucinvitesendtask.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppclient.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppclient.h"
 
 namespace buzz {
 

talk/examples/call/mucinvitesendtask.h

@@ -29,8 +29,8 @@
 #define _MUCINVITESENDTASK_H_
 
 #include "talk/examples/call/muc.h"
-#include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
 

talk/examples/call/presencepushtask.cc

@@ -28,7 +28,7 @@
 #include "talk/examples/call/presencepushtask.h"
 
 #include "talk/examples/call/muc.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/stringencode.h"
 
 

talk/examples/call/presencepushtask.h

@@ -31,9 +31,9 @@
 #include <vector>
 
 #include "talk/examples/call/callclient.h"
-#include "talk/xmpp/presencestatus.h"
-#include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/xmpptask.h"
+#include "webrtc/libjingle/xmpp/presencestatus.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmpptask.h"
 #include "webrtc/base/sigslot.h"
 
 namespace buzz {

talk/examples/login/login_main.cc

@@ -29,10 +29,10 @@
 
 #include <iostream>
 
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/xmppengine.h"
-#include "talk/xmpp/xmppthread.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
+#include "webrtc/libjingle/xmpp/xmppengine.h"
+#include "webrtc/libjingle/xmpp/xmppthread.h"
 #include "webrtc/base/thread.h"
 
 int main(int argc, char **argv) {

talk/examples/relayserver/relayserver_main.cc

@@ -27,7 +27,7 @@
 
 #include <iostream>  // NOLINT
 
-#include "talk/p2p/base/relayserver.h"
+#include "webrtc/p2p/base/relayserver.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread.h"
 

talk/examples/stunserver/stunserver_main.cc

@@ -31,7 +31,7 @@
 
 #include <iostream>
 
-#include "talk/p2p/base/stunserver.h"
+#include "webrtc/p2p/base/stunserver.h"
 #include "webrtc/base/thread.h"
 
 using namespace cricket;

talk/examples/turnserver/turnserver_main.cc

@@ -27,8 +27,8 @@
 
 #include <iostream>  // NOLINT
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/turnserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/turnserver.h"
 #include "webrtc/base/asyncudpsocket.h"
 #include "webrtc/base/optionsfile.h"
 #include "webrtc/base/stringencode.h"

talk/libjingle.gyp

@@ -299,7 +299,7 @@
   'targets': [
     {
       'target_name': 'libjingle',
-      'type': 'static_library',
+      'type': 'none',
       'dependencies': [
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
@@ -309,81 +309,6 @@
         '<(DEPTH)/third_party/expat/expat.gyp:expat',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
-      'sources': [
-        'xmpp/asyncsocket.h',
-        'xmpp/chatroommodule.h',
-        'xmpp/chatroommoduleimpl.cc',
-        'xmpp/constants.cc',
-        'xmpp/constants.h',
-        'xmpp/discoitemsquerytask.cc',
-        'xmpp/discoitemsquerytask.h',
-        'xmpp/hangoutpubsubclient.cc',
-        'xmpp/hangoutpubsubclient.h',
-        'xmpp/iqtask.cc',
-        'xmpp/iqtask.h',
-        'xmpp/jid.cc',
-        'xmpp/jid.h',
-        'xmpp/module.h',
-        'xmpp/moduleimpl.cc',
-        'xmpp/moduleimpl.h',
-        'xmpp/mucroomconfigtask.cc',
-        'xmpp/mucroomconfigtask.h',
-        'xmpp/mucroomdiscoverytask.cc',
-        'xmpp/mucroomdiscoverytask.h',
-        'xmpp/mucroomlookuptask.cc',
-        'xmpp/mucroomlookuptask.h',
-        'xmpp/mucroomuniquehangoutidtask.cc',
-        'xmpp/mucroomuniquehangoutidtask.h',
-        'xmpp/pingtask.cc',
-        'xmpp/pingtask.h',
-        'xmpp/plainsaslhandler.h',
-        'xmpp/presenceouttask.cc',
-        'xmpp/presenceouttask.h',
-        'xmpp/presencereceivetask.cc',
-        'xmpp/presencereceivetask.h',
-        'xmpp/presencestatus.cc',
-        'xmpp/presencestatus.h',
-        'xmpp/prexmppauth.h',
-        'xmpp/pubsub_task.cc',
-        'xmpp/pubsub_task.h',
-        'xmpp/pubsubclient.cc',
-        'xmpp/pubsubclient.h',
-        'xmpp/pubsubstateclient.cc',
-        'xmpp/pubsubstateclient.h',
-        'xmpp/pubsubtasks.cc',
-        'xmpp/pubsubtasks.h',
-        'xmpp/receivetask.cc',
-        'xmpp/receivetask.h',
-        'xmpp/rostermodule.h',
-        'xmpp/rostermoduleimpl.cc',
-        'xmpp/rostermoduleimpl.h',
-        'xmpp/saslcookiemechanism.h',
-        'xmpp/saslhandler.h',
-        'xmpp/saslmechanism.cc',
-        'xmpp/saslmechanism.h',
-        'xmpp/saslplainmechanism.h',
-        'xmpp/xmppauth.cc',
-        'xmpp/xmppauth.h',
-        'xmpp/xmppclient.cc',
-        'xmpp/xmppclient.h',
-        'xmpp/xmppclientsettings.h',
-        'xmpp/xmppengine.h',
-        'xmpp/xmppengineimpl.cc',
-        'xmpp/xmppengineimpl.h',
-        'xmpp/xmppengineimpl_iq.cc',
-        'xmpp/xmpplogintask.cc',
-        'xmpp/xmpplogintask.h',
-        'xmpp/xmpppump.cc',
-        'xmpp/xmpppump.h',
-        'xmpp/xmppsocket.cc',
-        'xmpp/xmppsocket.h',
-        'xmpp/xmppstanzaparser.cc',
-        'xmpp/xmppstanzaparser.h',
-        'xmpp/xmpptask.cc',
-        'xmpp/xmpptask.h',
-        'xmpp/xmppthread.cc',
-        'xmpp/xmppthread.h',
-      ],
     },  # target libjingle
     {
       'target_name': 'libjingle_media',
@@ -403,6 +328,8 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default',
         '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+        '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
+        '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
         'libjingle',
       ],
       'direct_dependent_settings': {
@@ -628,90 +555,6 @@
         ],
       },
       'sources': [
-        'p2p/base/asyncstuntcpsocket.cc',
-        'p2p/base/asyncstuntcpsocket.h',
-        'p2p/base/basicpacketsocketfactory.cc',
-        'p2p/base/basicpacketsocketfactory.h',
-        'p2p/base/candidate.h',
-        'p2p/base/common.h',
-        'p2p/base/constants.cc',
-        'p2p/base/constants.h',
-        'p2p/base/dtlstransportchannel.cc',
-        'p2p/base/dtlstransportchannel.h',
-        'p2p/base/p2ptransport.cc',
-        'p2p/base/p2ptransport.h',
-        'p2p/base/p2ptransportchannel.cc',
-        'p2p/base/p2ptransportchannel.h',
-        'p2p/base/packetsocketfactory.h',
-        'p2p/base/parsing.cc',
-        'p2p/base/parsing.h',
-        'p2p/base/port.cc',
-        'p2p/base/port.h',
-        'p2p/base/portallocator.cc',
-        'p2p/base/portallocator.h',
-        'p2p/base/portallocatorsessionproxy.cc',
-        'p2p/base/portallocatorsessionproxy.h',
-        'p2p/base/portinterface.h',
-        'p2p/base/portproxy.cc',
-        'p2p/base/portproxy.h',
-        'p2p/base/pseudotcp.cc',
-        'p2p/base/pseudotcp.h',
-        'p2p/base/rawtransport.cc',
-        'p2p/base/rawtransport.h',
-        'p2p/base/rawtransportchannel.cc',
-        'p2p/base/rawtransportchannel.h',
-        'p2p/base/relayport.cc',
-        'p2p/base/relayport.h',
-        'p2p/base/relayserver.cc',
-        'p2p/base/relayserver.h',
-        'p2p/base/session.cc',
-        'p2p/base/session.h',
-        'p2p/base/sessionclient.h',
-        'p2p/base/sessiondescription.cc',
-        'p2p/base/sessiondescription.h',
-        'p2p/base/sessionid.h',
-        'p2p/base/sessionmanager.cc',
-        'p2p/base/sessionmanager.h',
-        'p2p/base/sessionmessages.cc',
-        'p2p/base/sessionmessages.h',
-        'p2p/base/stun.cc',
-        'p2p/base/stun.h',
-        'p2p/base/stunport.cc',
-        'p2p/base/stunport.h',
-        'p2p/base/stunrequest.cc',
-        'p2p/base/stunrequest.h',
-        'p2p/base/stunserver.cc',
-        'p2p/base/stunserver.h',
-        'p2p/base/tcpport.cc',
-        'p2p/base/tcpport.h',
-        'p2p/base/transport.cc',
-        'p2p/base/transport.h',
-        'p2p/base/transportchannel.cc',
-        'p2p/base/transportchannel.h',
-        'p2p/base/transportchannelimpl.h',
-        'p2p/base/transportchannelproxy.cc',
-        'p2p/base/transportchannelproxy.h',
-        'p2p/base/transportdescription.cc',
-        'p2p/base/transportdescription.h',
-        'p2p/base/transportdescriptionfactory.cc',
-        'p2p/base/transportdescriptionfactory.h',
-        'p2p/base/transportinfo.h',
-        'p2p/base/turnport.cc',
-        'p2p/base/turnport.h',
-        'p2p/base/turnserver.cc',
-        'p2p/base/turnserver.h',
-        'p2p/base/udpport.h',
-        'p2p/client/autoportallocator.h',
-        'p2p/client/basicportallocator.cc',
-        'p2p/client/basicportallocator.h',
-        'p2p/client/connectivitychecker.cc',
-        'p2p/client/connectivitychecker.h',
-        'p2p/client/httpportallocator.cc',
-        'p2p/client/httpportallocator.h',
-        'p2p/client/sessionmanagertask.h',
-        'p2p/client/sessionsendtask.h',
-        'p2p/client/socketmonitor.cc',
-        'p2p/client/socketmonitor.h',
         'session/tunnel/pseudotcpchannel.cc',
         'session/tunnel/pseudotcpchannel.h',
         'session/tunnel/tunnelsessionclient.cc',

talk/libjingle_examples.gyp

@@ -39,8 +39,8 @@
         'libjingle.gyp:libjingle_p2p',
       ],
       'sources': [
-        'xmpp/jingleinfotask.cc',
-        'xmpp/jingleinfotask.h',
+        '<(webrtc_root)/libjingle/xmpp/jingleinfotask.cc',
+        '<(webrtc_root)/libjingle/xmpp/jingleinfotask.h',
       ],
     },  # target libjingle_xmpphelp
     {

talk/libjingle_tests.gyp

@@ -81,21 +81,7 @@
         'libjingle_unittest_main',
       ],
       'sources': [
-        'xmpp/fakexmppclient.h',
-        'xmpp/hangoutpubsubclient_unittest.cc',
-        'xmpp/jid_unittest.cc',
-        'xmpp/mucroomconfigtask_unittest.cc',
-        'xmpp/mucroomdiscoverytask_unittest.cc',
-        'xmpp/mucroomlookuptask_unittest.cc',
-        'xmpp/mucroomuniquehangoutidtask_unittest.cc',
-        'xmpp/pingtask_unittest.cc',
-        'xmpp/pubsubclient_unittest.cc',
-        'xmpp/pubsubtasks_unittest.cc',
-        'xmpp/util_unittest.cc',
-        'xmpp/util_unittest.h',
-        'xmpp/xmppengine_unittest.cc',
-        'xmpp/xmpplogintask_unittest.cc',
-        'xmpp/xmppstanzaparser_unittest.cc',
+        '<(DEPTH)/webrtc/test/testsupport/always_passing_unittest.cc',
       ],  # sources
     },  # target libjingle_unittest
     {
@@ -190,28 +176,6 @@
         '<(DEPTH)/third_party/libsrtp/srtp',
       ],
       'sources': [
-        'p2p/base/dtlstransportchannel_unittest.cc',
-        'p2p/base/fakesession.h',
-        'p2p/base/p2ptransportchannel_unittest.cc',
-        'p2p/base/port_unittest.cc',
-        'p2p/base/portallocatorsessionproxy_unittest.cc',
-        'p2p/base/pseudotcp_unittest.cc',
-        'p2p/base/relayport_unittest.cc',
-        'p2p/base/relayserver_unittest.cc',
-        'p2p/base/session_unittest.cc',
-        'p2p/base/stun_unittest.cc',
-        'p2p/base/stunport_unittest.cc',
-        'p2p/base/stunrequest_unittest.cc',
-        'p2p/base/stunserver_unittest.cc',
-        'p2p/base/testrelayserver.h',
-        'p2p/base/teststunserver.h',
-        'p2p/base/testturnserver.h',
-        'p2p/base/transport_unittest.cc',
-        'p2p/base/transportdescriptionfactory_unittest.cc',
-        'p2p/base/turnport_unittest.cc',
-        'p2p/client/connectivitychecker_unittest.cc',
-        'p2p/client/fakeportallocator.h',
-        'p2p/client/portallocator_unittest.cc',
         'session/media/bundlefilter_unittest.cc',
         'session/media/channel_unittest.cc',
         'session/media/channelmanager_unittest.cc',
@@ -472,20 +436,6 @@
             'libjingle_peerconnection_unittest.isolate',
           ],
         },
-        {
-          'target_name': 'libjingle_unittest_run',
-          'type': 'none',
-          'dependencies': [
-            'libjingle_unittest',
-          ],
-          'includes': [
-            'build/isolate.gypi',
-            'libjingle_unittest.isolate',
-          ],
-          'sources': [
-            'libjingle_unittest.isolate',
-          ],
-        },
       ],
     }],
   ],

talk/media/base/fakemediaengine.h

@@ -38,7 +38,7 @@
 #include "talk/media/base/mediaengine.h"
 #include "talk/media/base/rtputils.h"
 #include "talk/media/base/streamparams.h"
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/stringutils.h"
 

talk/media/webrtc/webrtcvoiceengine_unittest.cc

@@ -40,7 +40,7 @@
 #include "talk/media/webrtc/fakewebrtcvoiceengine.h"
 #include "talk/media/webrtc/webrtcvie.h"
 #include "talk/media/webrtc/webrtcvoiceengine.h"
-#include "talk/p2p/base/fakesession.h"
+#include "webrtc/p2p/base/fakesession.h"
 #include "talk/session/media/channel.h"
 
 // Tests for the WebRtcVoiceEngine/VoiceChannel code.

talk/p2p/base/asyncstuntcpsocket.cc

@@ -25,11 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/asyncstuntcpsocket.h"
+#include "webrtc/p2p/base/asyncstuntcpsocket.h"
 
 #include <string.h>
 
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 

talk/p2p/base/asyncstuntcpsocket.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-#define TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
 
 #include "webrtc/base/asynctcpsocket.h"
 #include "webrtc/base/scoped_ptr.h"
@@ -64,4 +64,4 @@ class AsyncStunTCPSocket : public rtc::AsyncTCPSocketBase {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
+#endif  // WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_

talk/p2p/base/asyncstuntcpsocket_unittest.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/asyncstuntcpsocket.h"
+#include "webrtc/p2p/base/asyncstuntcpsocket.h"
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/physicalsocketserver.h"

talk/p2p/base/basicpacketsocketfactory.cc

@@ -25,10 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
 
-#include "talk/p2p/base/asyncstuntcpsocket.h"
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/asyncstuntcpsocket.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/asynctcpsocket.h"
 #include "webrtc/base/asyncudpsocket.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/basicpacketsocketfactory.h

@@ -25,10 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
-#define TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#ifndef WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#define WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
 
-#include "talk/p2p/base/packetsocketfactory.h"
+#include "webrtc/p2p/base/packetsocketfactory.h"
 
 namespace rtc {
 
@@ -65,4 +65,4 @@ class BasicPacketSocketFactory : public PacketSocketFactory {
 
 }  // namespace rtc
 
-#endif  // TALK_P2P_BASE_BASICPACKETSOCKETFACTORY_H_
+#endif  // WEBRTC_P2P_BASE_BASICPACKETSOCKETFACTORY_H_

talk/p2p/base/candidate.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_CANDIDATE_H_
-#define TALK_P2P_BASE_CANDIDATE_H_
+#ifndef WEBRTC_P2P_BASE_CANDIDATE_H_
+#define WEBRTC_P2P_BASE_CANDIDATE_H_
 
 #include <limits.h>
 #include <math.h>
@@ -35,7 +35,7 @@
 #include <sstream>
 #include <string>
 
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/socketaddress.h"
 
@@ -226,4 +226,4 @@ class Candidate {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_CANDIDATE_H_
+#endif  // WEBRTC_P2P_BASE_CANDIDATE_H_

talk/p2p/base/common.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_COMMON_H_
-#define TALK_P2P_BASE_COMMON_H_
+#ifndef WEBRTC_P2P_BASE_COMMON_H_
+#define WEBRTC_P2P_BASE_COMMON_H_
 
 #include "webrtc/base/logging.h"
 
@@ -34,4 +34,4 @@
 #define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": "
 #define LOG_JV(sev, obj) LOG_V(sev) << "Jingle:" << obj->ToString() << ": "
 
-#endif  // TALK_P2P_BASE_COMMON_H_
+#endif  // WEBRTC_P2P_BASE_COMMON_H_

talk/p2p/base/constants.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 
 #include <string>
 

talk/p2p/base/constants.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_CONSTANTS_H_
-#define TALK_P2P_BASE_CONSTANTS_H_
+#ifndef WEBRTC_P2P_BASE_CONSTANTS_H_
+#define WEBRTC_P2P_BASE_CONSTANTS_H_
 
 #include <string>
 #include "webrtc/libjingle/xmllite/qname.h"
@@ -273,4 +273,4 @@ extern const char CONNECTIONROLE_HOLDCONN_STR[];
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_CONSTANTS_H_
+#endif  // WEBRTC_P2P_BASE_CONSTANTS_H_

talk/p2p/base/dtlstransport.h

@@ -25,11 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_DTLSTRANSPORT_H_
-#define TALK_P2P_BASE_DTLSTRANSPORT_H_
+#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORT_H_
+#define WEBRTC_P2P_BASE_DTLSTRANSPORT_H_
 
-#include "talk/p2p/base/dtlstransportchannel.h"
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/dtlstransportchannel.h"
+#include "webrtc/p2p/base/transport.h"
 
 namespace rtc {
 class SSLIdentity;
@@ -254,4 +254,4 @@ class DtlsTransport : public Base {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_DTLSTRANSPORT_H_
+#endif  // WEBRTC_P2P_BASE_DTLSTRANSPORT_H_

talk/p2p/base/dtlstransportchannel.cc

@@ -26,9 +26,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/dtlstransportchannel.h"
+#include "webrtc/p2p/base/dtlstransportchannel.h"
 
-#include "talk/p2p/base/common.h"
+#include "webrtc/p2p/base/common.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/messagequeue.h"

talk/p2p/base/dtlstransportchannel.h

@@ -26,13 +26,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
-#define TALK_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
+#ifndef WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
+#define WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
 
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/transportchannelimpl.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslstreamadapter.h"
@@ -261,4 +261,4 @@ class DtlsTransportChannelWrapper : public TransportChannelImpl {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_DTLSTRANSPORTCHANNEL_H_
+#endif  // WEBRTC_P2P_BASE_DTLSTRANSPORTCHANNEL_H_

talk/p2p/base/dtlstransportchannel_unittest.cc

@@ -28,8 +28,8 @@
 
 #include <set>
 
-#include "talk/p2p/base/dtlstransport.h"
-#include "talk/p2p/base/fakesession.h"
+#include "webrtc/p2p/base/dtlstransport.h"
+#include "webrtc/p2p/base/fakesession.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/gunit.h"

talk/p2p/base/fakesession.h

@@ -25,17 +25,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_FAKESESSION_H_
-#define TALK_P2P_BASE_FAKESESSION_H_
+#ifndef WEBRTC_P2P_BASE_FAKESESSION_H_
+#define WEBRTC_P2P_BASE_FAKESESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/session.h"
-#include "talk/p2p/base/transport.h"
-#include "talk/p2p/base/transportchannel.h"
-#include "talk/p2p/base/transportchannelimpl.h"
+#include "webrtc/p2p/base/session.h"
+#include "webrtc/p2p/base/transport.h"
+#include "webrtc/p2p/base/transportchannel.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/fakesslidentity.h"
 #include "webrtc/base/messagequeue.h"
@@ -506,4 +506,4 @@ class FakeSession : public BaseSession {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_FAKESESSION_H_
+#endif  // WEBRTC_P2P_BASE_FAKESESSION_H_

talk/p2p/base/p2ptransport.cc

@@ -25,19 +25,19 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/p2ptransport.h"
+#include "webrtc/p2p/base/p2ptransport.h"
 
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/p2ptransportchannel.h"
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/sessionmanager.h"
-#include "talk/p2p/base/sessionmessages.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/sessionmessages.h"
 #include "webrtc/libjingle/xmllite/qname.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/stringencode.h"

talk/p2p/base/p2ptransport.h

@@ -25,12 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_P2PTRANSPORT_H_
-#define TALK_P2P_BASE_P2PTRANSPORT_H_
+#ifndef WEBRTC_P2P_BASE_P2PTRANSPORT_H_
+#define WEBRTC_P2P_BASE_P2PTRANSPORT_H_
 
 #include <string>
 #include <vector>
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/transport.h"
 
 namespace cricket {
 
@@ -100,4 +100,4 @@ class P2PTransportParser : public TransportParser {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_P2PTRANSPORT_H_
+#endif  // WEBRTC_P2P_BASE_P2PTRANSPORT_H_

talk/p2p/base/p2ptransportchannel.cc

@@ -25,12 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/p2ptransportchannel.h"
+#include "webrtc/p2p/base/p2ptransportchannel.h"
 
 #include <set>
-#include "talk/p2p/base/common.h"
-#include "talk/p2p/base/relayport.h"  // For RELAY_PORT_TYPE.
-#include "talk/p2p/base/stunport.h"  // For STUN_PORT_TYPE.
+#include "webrtc/p2p/base/common.h"
+#include "webrtc/p2p/base/relayport.h"  // For RELAY_PORT_TYPE.
+#include "webrtc/p2p/base/stunport.h"  // For STUN_PORT_TYPE.
 #include "webrtc/base/common.h"
 #include "webrtc/base/crc32.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/p2ptransportchannel.h

@@ -34,18 +34,18 @@
 // When all of the available connections become invalid (non-writable), we
 // kick off a process of determining more candidates and more connections.
 //
-#ifndef TALK_P2P_BASE_P2PTRANSPORTCHANNEL_H_
-#define TALK_P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#ifndef WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#define WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
 
 #include <map>
 #include <string>
 #include <vector>
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/p2ptransport.h"
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/portinterface.h"
-#include "talk/p2p/base/transport.h"
-#include "talk/p2p/base/transportchannelimpl.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/p2ptransport.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/p2p/base/transport.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/sigslot.h"
 
@@ -256,4 +256,4 @@ class P2PTransportChannel : public TransportChannelImpl,
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_P2PTRANSPORTCHANNEL_H_
+#endif  // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_

talk/p2p/base/p2ptransportchannel_unittest.cc

@@ -25,11 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/p2ptransportchannel.h"
-#include "talk/p2p/base/testrelayserver.h"
-#include "talk/p2p/base/teststunserver.h"
-#include "talk/p2p/base/testturnserver.h"
-#include "talk/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/p2p/base/testrelayserver.h"
+#include "webrtc/p2p/base/teststunserver.h"
+#include "webrtc/p2p/base/testturnserver.h"
+#include "webrtc/p2p/client/basicportallocator.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/fakenetwork.h"
 #include "webrtc/base/firewallsocketserver.h"

talk/p2p/base/packetsocketfactory.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PACKETSOCKETFACTORY_H_
-#define TALK_P2P_BASE_PACKETSOCKETFACTORY_H_
+#ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
+#define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
 
 #include "webrtc/base/proxyinfo.h"
 
@@ -66,4 +66,4 @@ class PacketSocketFactory {
 
 }  // namespace rtc
 
-#endif  // TALK_P2P_BASE_PACKETSOCKETFACTORY_H_
+#endif  // WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_

talk/p2p/base/parsing.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/parsing.h"
+#include "webrtc/p2p/base/parsing.h"
 
 #include <stdlib.h>
 #include <algorithm>

talk/p2p/base/parsing.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PARSING_H_
-#define TALK_P2P_BASE_PARSING_H_
+#ifndef WEBRTC_P2P_BASE_PARSING_H_
+#define WEBRTC_P2P_BASE_PARSING_H_
 
 #include <string>
 #include <vector>
@@ -154,4 +154,4 @@ std::vector<buzz::XmlElement*> CopyOfXmlChildren(const buzz::XmlElement* elem);
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PARSING_H_
+#endif  // WEBRTC_P2P_BASE_PARSING_H_

talk/p2p/base/port.cc

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/port.h"
+#include "webrtc/p2p/base/port.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "talk/p2p/base/common.h"
-#include "talk/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/common.h"
+#include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/crc32.h"
 #include "webrtc/base/helpers.h"

talk/p2p/base/port.h

@@ -25,20 +25,20 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PORT_H_
-#define TALK_P2P_BASE_PORT_H_
+#ifndef WEBRTC_P2P_BASE_PORT_H_
+#define WEBRTC_P2P_BASE_PORT_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/packetsocketfactory.h"
-#include "talk/p2p/base/portinterface.h"
-#include "talk/p2p/base/stun.h"
-#include "talk/p2p/base/stunrequest.h"
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/packetsocketfactory.h"
+#include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/p2p/base/stun.h"
+#include "webrtc/p2p/base/stunrequest.h"
+#include "webrtc/p2p/base/transport.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/network.h"
 #include "webrtc/base/proxyinfo.h"
@@ -616,4 +616,4 @@ class ProxyConnection : public Connection {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PORT_H_
+#endif  // WEBRTC_P2P_BASE_PORT_H_

talk/p2p/base/port_unittest.cc

@@ -25,16 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/portproxy.h"
-#include "talk/p2p/base/relayport.h"
-#include "talk/p2p/base/stunport.h"
-#include "talk/p2p/base/tcpport.h"
-#include "talk/p2p/base/testrelayserver.h"
-#include "talk/p2p/base/teststunserver.h"
-#include "talk/p2p/base/testturnserver.h"
-#include "talk/p2p/base/transport.h"
-#include "talk/p2p/base/turnport.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/portproxy.h"
+#include "webrtc/p2p/base/relayport.h"
+#include "webrtc/p2p/base/stunport.h"
+#include "webrtc/p2p/base/tcpport.h"
+#include "webrtc/p2p/base/testrelayserver.h"
+#include "webrtc/p2p/base/teststunserver.h"
+#include "webrtc/p2p/base/testturnserver.h"
+#include "webrtc/p2p/base/transport.h"
+#include "webrtc/p2p/base/turnport.h"
 #include "webrtc/base/crc32.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"

talk/p2p/base/portallocator.cc

@@ -25,9 +25,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/portallocator.h"
 
-#include "talk/p2p/base/portallocatorsessionproxy.h"
+#include "webrtc/p2p/base/portallocatorsessionproxy.h"
 
 namespace cricket {
 

talk/p2p/base/portallocator.h

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PORTALLOCATOR_H_
-#define TALK_P2P_BASE_PORTALLOCATOR_H_
+#ifndef WEBRTC_P2P_BASE_PORTALLOCATOR_H_
+#define WEBRTC_P2P_BASE_PORTALLOCATOR_H_
 
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/portinterface.h"
+#include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/proxyinfo.h"
 #include "webrtc/base/sigslot.h"
@@ -206,4 +206,4 @@ class PortAllocator : public sigslot::has_slots<> {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PORTALLOCATOR_H_
+#endif  // WEBRTC_P2P_BASE_PORTALLOCATOR_H_

talk/p2p/base/portallocatorsessionproxy.cc

@@ -25,10 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/portallocatorsessionproxy.h"
+#include "webrtc/p2p/base/portallocatorsessionproxy.h"
 
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/portproxy.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/portproxy.h"
 #include "webrtc/base/thread.h"
 
 namespace cricket {

talk/p2p/base/portallocatorsessionproxy.h

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_
-#define TALK_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_
+#ifndef WEBRTC_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_
+#define WEBRTC_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_
 
 #include <string>
 
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/portallocator.h"
 
 namespace cricket {
 class PortAllocator;
@@ -120,4 +120,4 @@ class PortAllocatorSessionProxy : public PortAllocatorSession {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_
+#endif  // WEBRTC_P2P_BASE_PORTALLOCATORSESSIONPROXY_H_

talk/p2p/base/portallocatorsessionproxy_unittest.cc

@@ -27,10 +27,10 @@
 
 #include <vector>
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/portallocatorsessionproxy.h"
-#include "talk/p2p/client/basicportallocator.h"
-#include "talk/p2p/client/fakeportallocator.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/portallocatorsessionproxy.h"
+#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/p2p/client/fakeportallocator.h"
 #include "webrtc/base/fakenetwork.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/thread.h"

talk/p2p/base/portinterface.h

@@ -25,12 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PORTINTERFACE_H_
-#define TALK_P2P_BASE_PORTINTERFACE_H_
+#ifndef WEBRTC_P2P_BASE_PORTINTERFACE_H_
+#define WEBRTC_P2P_BASE_PORTINTERFACE_H_
 
 #include <string>
 
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/transport.h"
 #include "webrtc/base/socketaddress.h"
 
 namespace rtc {
@@ -140,4 +140,4 @@ class PortInterface {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PORTINTERFACE_H_
+#endif  // WEBRTC_P2P_BASE_PORTINTERFACE_H_

talk/p2p/base/portproxy.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/portproxy.h"
+#include "webrtc/p2p/base/portproxy.h"
 
 namespace cricket {
 

talk/p2p/base/portproxy.h

@@ -25,10 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PORTPROXY_H_
-#define TALK_P2P_BASE_PORTPROXY_H_
+#ifndef WEBRTC_P2P_BASE_PORTPROXY_H_
+#define WEBRTC_P2P_BASE_PORTPROXY_H_
 
-#include "talk/p2p/base/portinterface.h"
+#include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/base/sigslot.h"
 
 namespace rtc {
@@ -101,4 +101,4 @@ class PortProxy : public PortInterface, public sigslot::has_slots<> {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PORTPROXY_H_
+#endif  // WEBRTC_P2P_BASE_PORTPROXY_H_

talk/p2p/base/pseudotcp.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
 
 #include <stdio.h>
 #include <stdlib.h>

talk/p2p/base/pseudotcp.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_PSEUDOTCP_H_
-#define TALK_P2P_BASE_PSEUDOTCP_H_
+#ifndef WEBRTC_P2P_BASE_PSEUDOTCP_H_
+#define WEBRTC_P2P_BASE_PSEUDOTCP_H_
 
 #include <list>
 
@@ -255,4 +255,4 @@ class PseudoTcp {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_PSEUDOTCP_H_
+#endif  // WEBRTC_P2P_BASE_PSEUDOTCP_H_

talk/p2p/base/pseudotcp_unittest.cc

@@ -27,7 +27,7 @@
 
 #include <vector>
 
-#include "talk/p2p/base/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/messagehandler.h"

talk/p2p/base/rawtransport.cc

@@ -27,14 +27,14 @@
 
 #include <string>
 #include <vector>
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/rawtransport.h"
-#include "talk/p2p/base/rawtransportchannel.h"
-#include "talk/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/rawtransport.h"
+#include "webrtc/p2p/base/rawtransportchannel.h"
+#include "webrtc/p2p/base/sessionmanager.h"
 #include "webrtc/libjingle/xmllite/qname.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/common.h"
 
 #if defined(FEATURE_ENABLE_PSTN)

talk/p2p/base/rawtransport.h

@@ -25,11 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_RAWTRANSPORT_H_
-#define TALK_P2P_BASE_RAWTRANSPORT_H_
+#ifndef WEBRTC_P2P_BASE_RAWTRANSPORT_H_
+#define WEBRTC_P2P_BASE_RAWTRANSPORT_H_
 
 #include <string>
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/transport.h"
 
 #if defined(FEATURE_ENABLE_PSTN)
 namespace cricket {
@@ -78,4 +78,4 @@ class RawTransport : public Transport, public TransportParser {
 
 #endif  // defined(FEATURE_ENABLE_PSTN)
 
-#endif  // TALK_P2P_BASE_RAWTRANSPORT_H_
+#endif  // WEBRTC_P2P_BASE_RAWTRANSPORT_H_

talk/p2p/base/rawtransportchannel.cc

@@ -25,20 +25,20 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/rawtransportchannel.h"
+#include "webrtc/p2p/base/rawtransportchannel.h"
 
 #include <string>
 #include <vector>
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/portinterface.h"
-#include "talk/p2p/base/rawtransport.h"
-#include "talk/p2p/base/relayport.h"
-#include "talk/p2p/base/sessionmanager.h"
-#include "talk/p2p/base/stunport.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/p2p/base/rawtransport.h"
+#include "webrtc/p2p/base/relayport.h"
+#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/stunport.h"
 #include "webrtc/libjingle/xmllite/qname.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/common.h"
 
 #if defined(FEATURE_ENABLE_PSTN)

talk/p2p/base/rawtransportchannel.h

@@ -25,14 +25,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_RAWTRANSPORTCHANNEL_H_
-#define TALK_P2P_BASE_RAWTRANSPORTCHANNEL_H_
+#ifndef WEBRTC_P2P_BASE_RAWTRANSPORTCHANNEL_H_
+#define WEBRTC_P2P_BASE_RAWTRANSPORTCHANNEL_H_
 
 #include <string>
 #include <vector>
-#include "talk/p2p/base/candidate.h"
-#include "talk/p2p/base/rawtransport.h"
-#include "talk/p2p/base/transportchannelimpl.h"
+#include "webrtc/p2p/base/candidate.h"
+#include "webrtc/p2p/base/rawtransport.h"
+#include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/messagequeue.h"
 
 #if defined(FEATURE_ENABLE_PSTN)
@@ -203,4 +203,4 @@ class RawTransportChannel : public TransportChannelImpl,
 }  // namespace cricket
 
 #endif  // defined(FEATURE_ENABLE_PSTN)
-#endif  // TALK_P2P_BASE_RAWTRANSPORTCHANNEL_H_
+#endif  // WEBRTC_P2P_BASE_RAWTRANSPORTCHANNEL_H_

talk/p2p/base/relayport.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/relayport.h"
+#include "webrtc/p2p/base/relayport.h"
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/relayport.h

@@ -25,16 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_RELAYPORT_H_
-#define TALK_P2P_BASE_RELAYPORT_H_
+#ifndef WEBRTC_P2P_BASE_RELAYPORT_H_
+#define WEBRTC_P2P_BASE_RELAYPORT_H_
 
 #include <deque>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "talk/p2p/base/port.h"
-#include "talk/p2p/base/stunrequest.h"
+#include "webrtc/p2p/base/port.h"
+#include "webrtc/p2p/base/stunrequest.h"
 
 namespace cricket {
 
@@ -115,4 +115,4 @@ class RelayPort : public Port {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_RELAYPORT_H_
+#endif  // WEBRTC_P2P_BASE_RELAYPORT_H_

talk/p2p/base/relayport_unittest.cc

@@ -25,9 +25,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/relayport.h"
-#include "talk/p2p/base/relayserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/relayport.h"
+#include "webrtc/p2p/base/relayserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/relayserver.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/relayserver.h"
+#include "webrtc/p2p/base/relayserver.h"
 
 #ifdef POSIX
 #include <errno.h>

talk/p2p/base/relayserver.h

@@ -25,15 +25,15 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_RELAYSERVER_H_
-#define TALK_P2P_BASE_RELAYSERVER_H_
+#ifndef WEBRTC_P2P_BASE_RELAYSERVER_H_
+#define WEBRTC_P2P_BASE_RELAYSERVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/port.h"
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/port.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/asyncudpsocket.h"
 #include "webrtc/base/socketaddresspair.h"
 #include "webrtc/base/thread.h"
@@ -249,4 +249,4 @@ class RelayServerBinding : public rtc::MessageHandler {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_RELAYSERVER_H_
+#endif  // WEBRTC_P2P_BASE_RELAYSERVER_H_

talk/p2p/base/relayserver_unittest.cc

@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "talk/p2p/base/relayserver.h"
+#include "webrtc/p2p/base/relayserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/session.cc

@@ -25,16 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/session.h"
+#include "webrtc/p2p/base/session.h"
 
-#include "talk/p2p/base/dtlstransport.h"
-#include "talk/p2p/base/p2ptransport.h"
-#include "talk/p2p/base/sessionclient.h"
-#include "talk/p2p/base/transport.h"
-#include "talk/p2p/base/transportchannelproxy.h"
-#include "talk/p2p/base/transportinfo.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
+#include "webrtc/p2p/base/dtlstransport.h"
+#include "webrtc/p2p/base/p2ptransport.h"
+#include "webrtc/p2p/base/sessionclient.h"
+#include "webrtc/p2p/base/transport.h"
+#include "webrtc/p2p/base/transportchannelproxy.h"
+#include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
@@ -42,7 +42,7 @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslstreamadapter.h"
 
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 
 namespace cricket {
 

talk/p2p/base/session.h

@@ -25,22 +25,22 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSION_H_
-#define TALK_P2P_BASE_SESSION_H_
+#ifndef WEBRTC_P2P_BASE_SESSION_H_
+#define WEBRTC_P2P_BASE_SESSION_H_
 
 #include <list>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/port.h"
-#include "talk/p2p/base/sessionclient.h"
-#include "talk/p2p/base/sessionmanager.h"
-#include "talk/p2p/base/sessionmessages.h"
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/port.h"
+#include "webrtc/p2p/base/sessionclient.h"
+#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/sessionmessages.h"
+#include "webrtc/p2p/base/transport.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/scoped_ref_ptr.h"
@@ -744,4 +744,4 @@ class Session : public BaseSession {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSION_H_
+#endif  // WEBRTC_P2P_BASE_SESSION_H_

talk/p2p/base/session_unittest.cc

@@ -31,22 +31,22 @@
 #include <map>
 #include <sstream>
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/p2ptransport.h"
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/relayport.h"
-#include "talk/p2p/base/relayserver.h"
-#include "talk/p2p/base/session.h"
-#include "talk/p2p/base/sessionclient.h"
-#include "talk/p2p/base/sessionmanager.h"
-#include "talk/p2p/base/stunport.h"
-#include "talk/p2p/base/stunserver.h"
-#include "talk/p2p/base/transportchannel.h"
-#include "talk/p2p/base/transportchannelproxy.h"
-#include "talk/p2p/base/udpport.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2ptransport.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/relayport.h"
+#include "webrtc/p2p/base/relayserver.h"
+#include "webrtc/p2p/base/session.h"
+#include "webrtc/p2p/base/sessionclient.h"
+#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/stunport.h"
+#include "webrtc/p2p/base/stunserver.h"
+#include "webrtc/p2p/base/transportchannel.h"
+#include "webrtc/p2p/base/transportchannelproxy.h"
+#include "webrtc/p2p/base/udpport.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"

talk/p2p/base/sessionclient.h

@@ -25,10 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSIONCLIENT_H_
-#define TALK_P2P_BASE_SESSIONCLIENT_H_
+#ifndef WEBRTC_P2P_BASE_SESSIONCLIENT_H_
+#define WEBRTC_P2P_BASE_SESSIONCLIENT_H_
 
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
 
 namespace buzz {
 class XmlElement;
@@ -92,4 +92,4 @@ class SessionClient : public ContentParser {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSIONCLIENT_H_
+#endif  // WEBRTC_P2P_BASE_SESSIONCLIENT_H_

talk/p2p/base/sessiondescription.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 

talk/p2p/base/sessiondescription.h

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSIONDESCRIPTION_H_
-#define TALK_P2P_BASE_SESSIONDESCRIPTION_H_
+#ifndef WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_
+#define WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_
 
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/transportinfo.h"
+#include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace cricket {
@@ -199,4 +199,4 @@ enum ContentSource {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSIONDESCRIPTION_H_
+#endif  // WEBRTC_P2P_BASE_SESSIONDESCRIPTION_H_

talk/p2p/base/sessionid.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSIONID_H_
-#define TALK_P2P_BASE_SESSIONID_H_
+#ifndef WEBRTC_P2P_BASE_SESSIONID_H_
+#define WEBRTC_P2P_BASE_SESSIONID_H_
 
 // TODO: Remove this file.
 
@@ -34,4 +34,4 @@ namespace cricket {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSIONID_H_
+#endif  // WEBRTC_P2P_BASE_SESSIONID_H_

talk/p2p/base/sessionmanager.cc

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/sessionmanager.h"
+#include "webrtc/p2p/base/sessionmanager.h"
 
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/session.h"
-#include "talk/p2p/base/sessionmessages.h"
-#include "talk/xmpp/constants.h"
-#include "talk/xmpp/jid.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/session.h"
+#include "webrtc/p2p/base/sessionmessages.h"
+#include "webrtc/libjingle/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/jid.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/sessionmanager.h

@@ -25,16 +25,16 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSIONMANAGER_H_
-#define TALK_P2P_BASE_SESSIONMANAGER_H_
+#ifndef WEBRTC_P2P_BASE_SESSIONMANAGER_H_
+#define WEBRTC_P2P_BASE_SESSIONMANAGER_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/transportdescriptionfactory.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 
@@ -208,4 +208,4 @@ class SessionManager : public sigslot::has_slots<> {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSIONMANAGER_H_
+#endif  // WEBRTC_P2P_BASE_SESSIONMANAGER_H_

talk/p2p/base/sessionmessages.cc

@@ -25,19 +25,19 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/sessionmessages.h"
+#include "webrtc/p2p/base/sessionmessages.h"
 
 #include <stdio.h>
 #include <string>
 
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/p2ptransport.h"
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/sessionclient.h"
-#include "talk/p2p/base/sessiondescription.h"
-#include "talk/p2p/base/transport.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2ptransport.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/sessionclient.h"
+#include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/transport.h"
 #include "webrtc/libjingle/xmllite/xmlconstants.h"
-#include "talk/xmpp/constants.h"
+#include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/stringutils.h"

talk/p2p/base/sessionmessages.h

@@ -25,17 +25,17 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_SESSIONMESSAGES_H_
-#define TALK_P2P_BASE_SESSIONMESSAGES_H_
+#ifndef WEBRTC_P2P_BASE_SESSIONMESSAGES_H_
+#define WEBRTC_P2P_BASE_SESSIONMESSAGES_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/sessiondescription.h"  // Needed to delete contents.
-#include "talk/p2p/base/transportinfo.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/parsing.h"
+#include "webrtc/p2p/base/sessiondescription.h"  // Needed to delete contents.
+#include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/base/basictypes.h"
 
@@ -240,4 +240,4 @@ bool FindSessionRedirect(const buzz::XmlElement* stanza,
                          SessionRedirect* redirect);
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_SESSIONMESSAGES_H_
+#endif  // WEBRTC_P2P_BASE_SESSIONMESSAGES_H_

talk/p2p/base/stun.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/stun.h"
 
 #include <string.h>
 

talk/p2p/base/stun.h

@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_STUN_H_
-#define TALK_P2P_BASE_STUN_H_
+#ifndef WEBRTC_P2P_BASE_STUN_H_
+#define WEBRTC_P2P_BASE_STUN_H_
 
 // This file contains classes for dealing with the STUN protocol, as specified
 // in RFC 5389, and its descendants.
@@ -646,4 +646,4 @@ class IceMessage : public StunMessage {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_STUN_H_
+#endif  // WEBRTC_P2P_BASE_STUN_H_

talk/p2p/base/stun_unittest.cc

@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/stunport.cc

@@ -25,11 +25,11 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/stunport.h"
+#include "webrtc/p2p/base/stunport.h"
 
-#include "talk/p2p/base/common.h"
-#include "talk/p2p/base/portallocator.h"
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/common.h"
+#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

talk/p2p/base/stunport.h

@@ -25,13 +25,13 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_STUNPORT_H_
-#define TALK_P2P_BASE_STUNPORT_H_
+#ifndef WEBRTC_P2P_BASE_STUNPORT_H_
+#define WEBRTC_P2P_BASE_STUNPORT_H_
 
 #include <string>
 
-#include "talk/p2p/base/port.h"
-#include "talk/p2p/base/stunrequest.h"
+#include "webrtc/p2p/base/port.h"
+#include "webrtc/p2p/base/stunrequest.h"
 #include "webrtc/base/asyncpacketsocket.h"
 
 // TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
@@ -252,4 +252,4 @@ class StunPort : public UDPPort {
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_STUNPORT_H_
+#endif  // WEBRTC_P2P_BASE_STUNPORT_H_

talk/p2p/base/stunport_unittest.cc

@@ -25,9 +25,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/basicpacketsocketfactory.h"
-#include "talk/p2p/base/stunport.h"
-#include "talk/p2p/base/teststunserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/p2p/base/stunport.h"
+#include "webrtc/p2p/base/teststunserver.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/physicalsocketserver.h"

talk/p2p/base/stunrequest.cc

@@ -25,7 +25,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "talk/p2p/base/stunrequest.h"
+#include "webrtc/p2p/base/stunrequest.h"
 
 #include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"

talk/p2p/base/stunrequest.h

@@ -25,12 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TALK_P2P_BASE_STUNREQUEST_H_
-#define TALK_P2P_BASE_STUNREQUEST_H_
+#ifndef WEBRTC_P2P_BASE_STUNREQUEST_H_
+#define WEBRTC_P2P_BASE_STUNREQUEST_H_
 
 #include <map>
 #include <string>
-#include "talk/p2p/base/stun.h"
+#include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/thread.h"
 
@@ -130,4 +130,4 @@ private:
 
 }  // namespace cricket
 
-#endif  // TALK_P2P_BASE_STUNREQUEST_H_
+#endif  // WEBRTC_P2P_BASE_STUNREQUEST_H_