Commit 59237d98 authored by jochen@chromium.org's avatar jochen@chromium.org

Move P2P unit tests to content_unittests

BUG=10502
TEST=content_unittests


Review URL: http://codereview.chromium.org/8680032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111513 0039d316-1c4b-4281-b951-d872f2087c98
parent 12861d53
...@@ -1149,7 +1149,6 @@ ...@@ -1149,7 +1149,6 @@
'<@(chromium_dependencies)', '<@(chromium_dependencies)',
# 2) test-specific support libraries: # 2) test-specific support libraries:
'../gpu/gpu.gyp:gpu_unittest_utils', '../gpu/gpu.gyp:gpu_unittest_utils',
'../jingle/jingle.gyp:jingle_glue_test_util',
'../media/media.gyp:media_test_support', '../media/media.gyp:media_test_support',
'../net/net.gyp:net', '../net/net.gyp:net',
'../net/net.gyp:net_test_support', '../net/net.gyp:net_test_support',
...@@ -2082,15 +2081,6 @@ ...@@ -2082,15 +2081,6 @@
'../v8/tools/gyp/v8.gyp:v8_shell#host', '../v8/tools/gyp/v8.gyp:v8_shell#host',
], ],
}], }],
['p2p_apis==1', {
'sources': [
'../content/browser/renderer_host/p2p/socket_host_test_utils.h',
'../content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
'../content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
'../content/browser/renderer_host/p2p/socket_host_udp_unittest.cc',
'../content/renderer/p2p/p2p_transport_impl_unittest.cc',
],
}],
['use_aura==1', { ['use_aura==1', {
'dependencies': [ 'dependencies': [
'../ui/aura/aura.gyp:test_support_aura', '../ui/aura/aura.gyp:test_support_aura',
......
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
'../crypto/crypto.gyp:crypto', '../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:gpu_unittest_utils', '../gpu/gpu.gyp:gpu_unittest_utils',
'../ipc/ipc.gyp:test_support_ipc', '../ipc/ipc.gyp:test_support_ipc',
'../jingle/jingle.gyp:jingle_glue_test_util',
'../media/media.gyp:media_test_support', '../media/media.gyp:media_test_support',
'../net/net.gyp:net_test_support', '../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
...@@ -256,6 +257,15 @@ ...@@ -256,6 +257,15 @@
'renderer/active_notification_tracker_unittest.cc', 'renderer/active_notification_tracker_unittest.cc',
], ],
}], }],
['p2p_apis==1', {
'sources': [
'browser/renderer_host/p2p/socket_host_test_utils.h',
'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
'renderer/p2p/p2p_transport_impl_unittest.cc',
],
}],
['use_x11 == 1', { ['use_x11 == 1', {
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:dbus', '../build/linux/system.gyp:dbus',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment