| Index: ash/test/ash_test_base.cc
|
| diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
|
| index 5b92cd83336731decd2bfc8c39466acdd402798e..e0ce896c545ded7a23655c2cee8d2d4e798e9b02 100644
|
| --- a/ash/test/ash_test_base.cc
|
| +++ b/ash/test/ash_test_base.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "ash/shell.h"
|
| #include "ash/test/test_shell_delegate.h"
|
| +#include "base/run_loop.h"
|
| #include "base/string_split.h"
|
| #include "content/public/test/web_contents_tester.h"
|
| #include "ui/aura/env.h"
|
| @@ -90,8 +91,9 @@ void AshTestBase::UpdateMonitor(const std::string& display_specs) {
|
|
|
| void AshTestBase::RunAllPendingInMessageLoop() {
|
| #if !defined(OS_MACOSX)
|
| - message_loop_.RunAllPendingWithDispatcher(
|
| - aura::Env::GetInstance()->GetDispatcher());
|
| + DCHECK(MessageLoopForUI::current() == &message_loop_);
|
| + base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
|
| + run_loop.RunUntilIdle();
|
| #endif
|
| }
|
|
|
|
|