diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 01:05:31 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 01:05:31 +0000 |
| commit | 1290af9df599257e3cc3112504ed944ed3a00ce7 (patch) | |
| tree | 857975493a30d83cbb82497bc0315042a9867dc1 /tools | |
| parent | f8aa077c2ca13e8d665e0644e4de567c0380f37c (diff) | |
| download | chromium_src-1290af9df599257e3cc3112504ed944ed3a00ce7.zip chromium_src-1290af9df599257e3cc3112504ed944ed3a00ce7.tar.gz chromium_src-1290af9df599257e3cc3112504ed944ed3a00ce7.tar.bz2 | |
Revert 96089 - Remove video_channel() from Session interface
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/7508044
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/7604021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
3 files changed, 12 insertions, 6 deletions
diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt index a21737c..25a2ba5 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt @@ -1,8 +1,10 @@ # Following tests create real libjingle connections, and libjingle has # hardcoded timeouts, so these tests fail under TSan. JingleSessionTest.Connect -JingleSessionTest.TestUdpChannel -JingleSessionTest.TestTcpChannel +JingleSessionTest.TestControlChannel +JingleSessionTest.TestEventChannel +JingleSessionTest.TestVideoChannel +JingleSessionTest.TestVideoRtpChannel JingleSessionTest.TestSpeed # This test fails on an assertion, see http://crbug.com/57266 diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt index af33ac1..d7ec34f 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan.txt @@ -2,6 +2,8 @@ # hardcoded timeouts, so these tests fail under TSan. JingleSessionTest.Connect JingleSessionTest.ConnectBadChannelAuth -JingleSessionTest.TestUdpChannel -JingleSessionTest.TestTcpChannel +JingleSessionTest.TestControlChannel +JingleSessionTest.TestEventChannel JingleSessionTest.TestSpeed +JingleSessionTest.TestVideoChannel +JingleSessionTest.TestVideoRtpChannel diff --git a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt index 118c299..744a1e3 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt @@ -1,6 +1,8 @@ # Following tests create real libjingle connections, and libjingle has # hardcoded timeouts, so these tests fail under TSan. JingleSessionTest.Connect -JingleSessionTest.TestUdpChannel -JingleSessionTest.TestTcpChannel +JingleSessionTest.TestControlChannel +JingleSessionTest.TestEventChannel +JingleSessionTest.TestVideoChannel +JingleSessionTest.TestVideoRtpChannel JingleSessionTest.TestSpeed |