diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 13:36:09 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 13:36:09 +0000 |
| commit | d3f67ee72e058cade6e383ee40bd29bcb7b37d61 (patch) | |
| tree | 0f7d12d80025e3bbc702d80b8c49a12764751fb4 /chrome | |
| parent | 7102690b3ba3e8ffe9a4c19de81f9c572b20d03c (diff) | |
| download | chromium_src-d3f67ee72e058cade6e383ee40bd29bcb7b37d61.zip chromium_src-d3f67ee72e058cade6e383ee40bd29bcb7b37d61.tar.gz chromium_src-d3f67ee72e058cade6e383ee40bd29bcb7b37d61.tar.bz2 | |
Revert 111513 - Move P2P unit tests to content_unittests
BUG=10502
TEST=content_unittests
Review URL: http://codereview.chromium.org/8680032
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/8693001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_tests.gypi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 91d9b2a..559c381 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1149,6 +1149,7 @@ '<@(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', @@ -2081,6 +2082,15 @@ '../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', |