Commit 7f23772b authored by jochen@chromium.org's avatar jochen@chromium.org

Move P2P unit tests to content_unittests

Also fix uninitialized memory in the jingle thread wrapper

BUG=10502
TEST=content_unittests, valgrind is happy


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111568 0039d316-1c4b-4281-b951-d872f2087c98
parent 2cb361cb
......@@ -1149,7 +1149,6 @@
'<@(chromium_dependencies)',
# 2) test-specific support libraries:
'../gpu/gpu.gyp:gpu_unittest_utils',
'../jingle/jingle.gyp:jingle_glue_test_util',
'../media/media.gyp:media_test_support',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
......@@ -2078,15 +2077,6 @@
'../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', {
'dependencies': [
'../ui/aura/aura.gyp:test_support_aura',
......
......@@ -140,6 +140,7 @@
'../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:gpu_unittest_utils',
'../ipc/ipc.gyp:test_support_ipc',
'../jingle/jingle.gyp:jingle_glue_test_util',
'../media/media.gyp:media_test_support',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
......@@ -258,6 +259,15 @@
'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', {
'dependencies': [
'../build/linux/system.gyp:dbus',
......
......@@ -45,6 +45,7 @@ JingleThreadWrapper* JingleThreadWrapper::current() {
JingleThreadWrapper::JingleThreadWrapper(MessageLoop* message_loop)
: message_loop_(message_loop),
send_allowed_(false),
last_task_id_(0),
pending_send_event_(true, false) {
DCHECK_EQ(message_loop_, MessageLoop::current());
......
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