diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 22:34:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 22:34:00 +0000 |
| commit | fb578635ffff99206af1cf78f9c698a524a61479 (patch) | |
| tree | 1d5735a69073bdeaae2a49d43ac6e51067e94ed2 /remoting/protocol/channel_multiplexer_unittest.cc | |
| parent | 115dcfe4de38512d865f5de3dfff89e0f6adc726 (diff) | |
| download | chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.zip chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.tar.gz chromium_src-fb578635ffff99206af1cf78f9c698a524a61479.tar.bz2 | |
remoting: Update calls froms RunAllPending() to RunUntilIdle().
BUG=131220
TEST=remoting_unittests
R=sergeyu@chromium.org,wez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11364031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/channel_multiplexer_unittest.cc')
| -rw-r--r-- | remoting/protocol/channel_multiplexer_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc index 781e118..8bfe019 100644 --- a/remoting/protocol/channel_multiplexer_unittest.cc +++ b/remoting/protocol/channel_multiplexer_unittest.cc @@ -260,7 +260,7 @@ TEST_F(ChannelMultiplexerTest, WriteFailSync) { EXPECT_EQ(net::ERR_FAILED, host_socket2_->Write(buf, buf->size(), base::Bind( &MockSocketCallback::OnDone, base::Unretained(&cb2)))); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); } TEST_F(ChannelMultiplexerTest, WriteFailAsync) { @@ -291,7 +291,7 @@ TEST_F(ChannelMultiplexerTest, WriteFailAsync) { host_socket2_->Write(buf, buf->size(), base::Bind( &MockSocketCallback::OnDone, base::Unretained(&cb2)))); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); } TEST_F(ChannelMultiplexerTest, DeleteWhenFailed) { @@ -326,7 +326,7 @@ TEST_F(ChannelMultiplexerTest, DeleteWhenFailed) { host_socket2_->Write(buf, buf->size(), base::Bind( &MockSocketCallback::OnDone, base::Unretained(&cb2)))); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); // Check that the sockets were destroyed. EXPECT_FALSE(host_mux_.get()); @@ -351,7 +351,7 @@ TEST_F(ChannelMultiplexerTest, SessionFail) { EXPECT_CALL(cb2, OnConnectedPtr(_)) .Times(0); - message_loop_.RunAllPending(); + message_loop_.RunUntilIdle(); } } // namespace protocol |