Chromium Code Reviews| Index: remoting/protocol/channel_multiplexer_unittest.cc |
| diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc |
| index 0cac0452110ba64f01cbbc446894bd21c71ab9ab..39b6919af78d4be528bad328586ff38ebb0765c0 100644 |
| --- a/remoting/protocol/channel_multiplexer_unittest.cc |
| +++ b/remoting/protocol/channel_multiplexer_unittest.cc |
| @@ -99,7 +99,7 @@ class ChannelMultiplexerTest : public testing::Test { |
| &ChannelMultiplexerTest::OnChannelConnected, base::Unretained(this), |
| client_socket, &counter)); |
| - message_loop_.Run(); |
| + base::RunLoop().Run(); |
| EXPECT_TRUE(host_socket->get()); |
| EXPECT_TRUE(client_socket->get()); |
| @@ -124,8 +124,10 @@ class ChannelMultiplexerTest : public testing::Test { |
| return result; |
| } |
| + private: |
| base::MessageLoop message_loop_; |
|
gab
2016/07/04 14:47:06
ditto
fdoray
2016/07/04 16:33:59
Doesn't work because the constructor of FakeStream
gab
2016/07/04 17:24:14
Ok, thanks for adding justification comment.
|
| + protected: |
| FakeStreamChannelFactory host_channel_factory_; |
| FakeStreamChannelFactory client_channel_factory_; |
| @@ -148,7 +150,7 @@ TEST_F(ChannelMultiplexerTest, OneChannel) { |
| StreamConnectionTester tester(host_socket.get(), client_socket.get(), |
| kMessageSize, kMessages); |
| tester.Start(); |
| - message_loop_.Run(); |
| + base::RunLoop().Run(); |
| tester.CheckResults(); |
| } |
| @@ -170,7 +172,7 @@ TEST_F(ChannelMultiplexerTest, TwoChannels) { |
| tester1.Start(); |
| tester2.Start(); |
| while (!tester1.done() || !tester2.done()) { |
| - message_loop_.Run(); |
| + base::RunLoop().Run(); |
| } |
| tester1.CheckResults(); |
| tester2.CheckResults(); |
| @@ -212,7 +214,7 @@ TEST_F(ChannelMultiplexerTest, FourChannels) { |
| tester4.Start(); |
| while (!tester1.done() || !tester2.done() || |
| !tester3.done() || !tester4.done()) { |
| - message_loop_.Run(); |
| + base::RunLoop().Run(); |
| } |
| tester1.CheckResults(); |
| tester2.CheckResults(); |