diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:54:18 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 00:54:18 +0000 |
| commit | 4beaa60d694a49fe345d9724dc9759767bfa95c5 (patch) | |
| tree | 931ebbaf2bbf7e3c9fff14626c72a92248f73295 /remoting/protocol | |
| parent | 89ac74502f031c681d179f82d01eea96cda22d1d (diff) | |
| download | chromium_src-4beaa60d694a49fe345d9724dc9759767bfa95c5.zip chromium_src-4beaa60d694a49fe345d9724dc9759767bfa95c5.tar.gz chromium_src-4beaa60d694a49fe345d9724dc9759767bfa95c5.tar.bz2 | |
Revert 63809 - Remove TSan supporessions on windows for remoting_unittests.
BUG=57832
TEST=None
Review URL: http://codereview.chromium.org/3606014
TBR=sergeyu@chromium.org
Review URL: http://codereview.chromium.org/4138004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/jingle_chromoting_connection_unittest.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/remoting/protocol/jingle_chromoting_connection_unittest.cc b/remoting/protocol/jingle_chromoting_connection_unittest.cc index 66a24b9..abd00f9 100644 --- a/remoting/protocol/jingle_chromoting_connection_unittest.cc +++ b/remoting/protocol/jingle_chromoting_connection_unittest.cc @@ -164,12 +164,10 @@ class JingleChromotingConnectionTest : public testing::Test { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - ASSERT_TRUE( - host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms()))); - ASSERT_TRUE( - client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms()))); + host_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms())); + client_connected_event.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms())); } static void SignalEvent(base::WaitableEvent* event) { @@ -225,9 +223,8 @@ class ChannelTesterBase : public base::RefCountedThreadSafe<ChannelTesterBase> { } void WaitFinished() { - ASSERT_TRUE( - done_event_.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms()))); + done_event_.TimedWait(base::TimeDelta::FromMilliseconds( + TestTimeouts::action_max_timeout_ms())); } virtual void CheckResults() = 0; @@ -535,9 +532,8 @@ TEST_F(JingleChromotingConnectionTest, RejectConnection) { NewCallback(&client_connection_callback_, &MockConnectionCallback::OnStateChange)); - ASSERT_TRUE( - done_event.TimedWait(base::TimeDelta::FromMilliseconds( - TestTimeouts::action_max_timeout_ms()))); + done_event.TimedWait( + base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms())); } // Verify that we can connect two endpoints. |