diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
commit | 319dab11b1ee7e16b8f4089261f47d353aa8a466 (patch) | |
tree | 6c8db94b10f88a7e8711cd3b06ed8ab6fda39070 /tools | |
parent | 4993f34cdf20cf9e1124656164e2c647efba6989 (diff) | |
download | chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.zip chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.gz chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.bz2 |
Added control channel in ChromotingConnection. Moved channel
initialization to OnInitiate() in JingleChromotingConnection.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/4055002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r-- | tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt | 1 | ||||
-rw-r--r-- | tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt | 1 |
2 files changed, 2 insertions, 0 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 9ba3024..9f2bdf8 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-drmemory_win32.txt @@ -1,4 +1,5 @@ # These tests fail under Dr. Memory; see http://crbug.com/57832 +JingleChromotingConnectionTest.TestControlChannel JingleChromotingConnectionTest.TestVideoChannel JingleChromotingConnectionTest.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 035246d..c701254 100644 --- a/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/remoting_unittests.gtest-tsan_win32.txt @@ -1,4 +1,5 @@ # Fail under TSan, see http://crbug.com/57832 +JingleChromotingConnectionTest.TestControlChannel JingleChromotingConnectionTest.TestVideoChannel JingleChromotingConnectionTest.TestVideoRtpChannel |