| Index: jingle/notifier/base/xmpp_connection_unittest.cc
|
| diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
|
| index 60645bbbaac254ccafe4d136ad19c827b18e443f..ee1b44de397ecb11b53969273f6a9c997caf5518 100644
|
| --- a/jingle/notifier/base/xmpp_connection_unittest.cc
|
| +++ b/jingle/notifier/base/xmpp_connection_unittest.cc
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/message_loop/message_pump_default.h"
|
| +#include "base/run_loop.h"
|
| #include "jingle/glue/mock_task.h"
|
| #include "jingle/glue/task_pump.h"
|
| #include "jingle/notifier/base/weak_xmpp_client.h"
|
| @@ -87,7 +88,7 @@ class XmppConnectionTest : public testing::Test {
|
|
|
| void TearDown() override {
|
| // Clear out any messages posted by XmppConnection's destructor.
|
| - message_loop_->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| // Needed by XmppConnection.
|
| @@ -117,7 +118,7 @@ TEST_F(XmppConnectionTest, ImmediateFailure) {
|
|
|
| // We need to do this *before* |xmpp_connection| gets destroyed or
|
| // our delegate won't be called.
|
| - message_loop_->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| TEST_F(XmppConnectionTest, PreAuthFailure) {
|
| @@ -136,7 +137,7 @@ TEST_F(XmppConnectionTest, PreAuthFailure) {
|
|
|
| // We need to do this *before* |xmpp_connection| gets destroyed or
|
| // our delegate won't be called.
|
| - message_loop_->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| TEST_F(XmppConnectionTest, FailureAfterPreAuth) {
|
| @@ -155,7 +156,7 @@ TEST_F(XmppConnectionTest, FailureAfterPreAuth) {
|
|
|
| // We need to do this *before* |xmpp_connection| gets destroyed or
|
| // our delegate won't be called.
|
| - message_loop_->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| TEST_F(XmppConnectionTest, RaisedError) {
|
| @@ -252,7 +253,7 @@ TEST_F(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor) {
|
| }
|
|
|
| // This should destroy |task_pump|, but |task| still shouldn't run.
|
| - message_loop_->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| } // namespace notifier
|
|
|