Index: remoting/protocol/message_reader_unittest.cc |
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc |
index b3e62892c16e51649b59dd293da9225c64ff15f4..59e22f271192b69dfcce053fd101daae0c41c88a 100644 |
--- a/remoting/protocol/message_reader_unittest.cc |
+++ b/remoting/protocol/message_reader_unittest.cc |
@@ -117,7 +117,7 @@ TEST_F(MessageReaderTest, OneMessage_Delay) { |
.WillOnce(SaveArg<0>(&done_task)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
Mock::VerifyAndClearExpectations(&callback_); |
Mock::VerifyAndClearExpectations(&socket_); |
@@ -142,7 +142,7 @@ TEST_F(MessageReaderTest, OneMessage_Instant) { |
.WillOnce(CallDoneTask()); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(socket_.read_pending()); |
EXPECT_EQ(1U, messages_.size()); |
@@ -162,7 +162,7 @@ TEST_F(MessageReaderTest, TwoMessages_Together) { |
.WillOnce(SaveArg<0>(&done_task2)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
Mock::VerifyAndClearExpectations(&callback_); |
Mock::VerifyAndClearExpectations(&socket_); |
@@ -175,12 +175,12 @@ TEST_F(MessageReaderTest, TwoMessages_Together) { |
EXPECT_FALSE(socket_.read_pending()); |
done_task1.Run(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_FALSE(socket_.read_pending()); |
done_task2.Run(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(socket_.read_pending()); |
} |
@@ -199,7 +199,7 @@ TEST_F(MessageReaderTest, TwoMessages_Instant) { |
.WillOnce(SaveArg<0>(&done_task2)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
Mock::VerifyAndClearExpectations(&callback_); |
Mock::VerifyAndClearExpectations(&socket_); |
@@ -227,7 +227,7 @@ TEST_F(MessageReaderTest, TwoMessages_Instant2) { |
.WillOnce(CallDoneTask()); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(socket_.read_pending()); |
} |
@@ -243,7 +243,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { |
.WillOnce(SaveArg<0>(&done_task)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
Mock::VerifyAndClearExpectations(&callback_); |
Mock::VerifyAndClearExpectations(&socket_); |
@@ -255,7 +255,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { |
EXPECT_FALSE(socket_.read_pending()); |
done_task.Run(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(socket_.read_pending()); |
@@ -264,7 +264,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { |
.Times(1) |
.WillOnce(SaveArg<0>(&done_task)); |
AddMessage(kTestMessage2); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(CompareResult(messages_[1], kTestMessage2)); |
@@ -300,7 +300,7 @@ TEST_F(MessageReaderTest, ReadFromCallback) { |
.WillOnce(Invoke(this, &MessageReaderTest::OnSecondMessage)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
EXPECT_TRUE(socket_.read_pending()); |
} |
@@ -319,7 +319,7 @@ TEST_F(MessageReaderTest, DeleteFromCallback) { |
.WillOnce(Invoke(this, &MessageReaderTest::DeleteReader)); |
InitReader(); |
- message_loop_.RunAllPending(); |
+ message_loop_.RunUntilIdle(); |
} |
} // namespace protocol |