Put pseudotcp back because remoting uses it.
R=andrew@webrtc.org, niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36409004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7887 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/libjingle/libjingle.gyp b/libjingle/libjingle.gyp
index ed8e226..0789bb9 100644
--- a/libjingle/libjingle.gyp
+++ b/libjingle/libjingle.gyp
@@ -37,8 +37,6 @@
'session/sessionclient.h',
'session/sessionmanagertask.h',
'session/sessionsendtask.h',
- 'tunnel/pseudotcp.cc',
- 'tunnel/pseudotcp.h',
'tunnel/pseudotcpchannel.cc',
'tunnel/pseudotcpchannel.h',
'tunnel/tunnelsessionclient.cc',
@@ -80,7 +78,6 @@
'sources': [
'media/mediamessages_unittest.cc',
'media/mediasessionclient_unittest.cc',
- 'tunnel/pseudotcp_unittest.cc',
],
'conditions': [
['OS=="win"', {
@@ -93,7 +90,7 @@
},
}],
],
- }, # target jingle_unittest
+ }, # target jingle_p2p_unittest
{
'target_name': 'libjingle_xmpphelp',
'type': 'static_library',
diff --git a/libjingle/tunnel/pseudotcpchannel.h b/libjingle/tunnel/pseudotcpchannel.h
index 3310c09..ad6d907 100644
--- a/libjingle/tunnel/pseudotcpchannel.h
+++ b/libjingle/tunnel/pseudotcpchannel.h
@@ -28,7 +28,7 @@
#ifndef TALK_SESSION_TUNNEL_PSEUDOTCPCHANNEL_H_
#define TALK_SESSION_TUNNEL_PSEUDOTCPCHANNEL_H_
-#include "webrtc/libjingle/tunnel/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/messagequeue.h"
diff --git a/libjingle/tunnel/tunnelsessionclient.h b/libjingle/tunnel/tunnelsessionclient.h
index 990d8bf..4fc2519 100644
--- a/libjingle/tunnel/tunnelsessionclient.h
+++ b/libjingle/tunnel/tunnelsessionclient.h
@@ -31,7 +31,7 @@
#include <vector>
#include "webrtc/p2p/base/constants.h"
-#include "webrtc/libjingle/tunnel/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
#include "webrtc/p2p/base/session.h"
#include "webrtc/libjingle/session/sessionclient.h"
#include "webrtc/p2p/base/sessiondescription.h"
diff --git a/libjingle/tunnel/pseudotcp.cc b/p2p/base/pseudotcp.cc
similarity index 99%
rename from libjingle/tunnel/pseudotcp.cc
rename to p2p/base/pseudotcp.cc
index d564684..0dfe7d8 100644
--- a/libjingle/tunnel/pseudotcp.cc
+++ b/p2p/base/pseudotcp.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/libjingle/tunnel/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/libjingle/tunnel/pseudotcp.h b/p2p/base/pseudotcp.h
similarity index 100%
rename from libjingle/tunnel/pseudotcp.h
rename to p2p/base/pseudotcp.h
diff --git a/libjingle/tunnel/pseudotcp_unittest.cc b/p2p/base/pseudotcp_unittest.cc
similarity index 99%
rename from libjingle/tunnel/pseudotcp_unittest.cc
rename to p2p/base/pseudotcp_unittest.cc
index ea2a49a..f5ea7ac 100644
--- a/libjingle/tunnel/pseudotcp_unittest.cc
+++ b/p2p/base/pseudotcp_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
-#include "webrtc/libjingle/tunnel/pseudotcp.h"
+#include "webrtc/p2p/base/pseudotcp.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/helpers.h"
#include "webrtc/base/messagehandler.h"
diff --git a/p2p/p2p.gyp b/p2p/p2p.gyp
index d9b925a..73fb9e3 100644
--- a/p2p/p2p.gyp
+++ b/p2p/p2p.gyp
@@ -48,6 +48,8 @@
'base/portinterface.h',
'base/portproxy.cc',
'base/portproxy.h',
+ 'base/pseudotcp.cc',
+ 'base/pseudotcp.h',
'base/rawtransport.cc',
'base/rawtransport.h',
'base/rawtransportchannel.cc',
diff --git a/p2p/p2p_tests.gypi b/p2p/p2p_tests.gypi
index 7b73f13..f9e6959 100644
--- a/p2p/p2p_tests.gypi
+++ b/p2p/p2p_tests.gypi
@@ -19,6 +19,7 @@
'base/p2ptransportchannel_unittest.cc',
'base/port_unittest.cc',
'base/portallocatorsessionproxy_unittest.cc',
+ 'base/pseudotcp_unittest.cc',
'base/relayport_unittest.cc',
'base/relayserver_unittest.cc',
'base/session_unittest.cc',
