summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/jingle_chromoting_connection_unittest.cc20
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.