diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 09:50:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-24 09:50:31 +0000 |
| commit | 94a9d1a995180fecbcc77f834cf4440eee8ca2ea (patch) | |
| tree | 842bb1b18dd476bdd1bbcf584d5be2abf5470f9c /ash/wm | |
| parent | d0cb7968035116a86d4f999890e6a153f3864f09 (diff) | |
| download | chromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.zip chromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.tar.gz chromium_src-94a9d1a995180fecbcc77f834cf4440eee8ca2ea.tar.bz2 | |
Changes to build ash_unittests with RunLoop().RunUntilIdle().
BUG=131220
TEST=ash_unittests
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12983012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/panels/panel_layout_manager_unittest.cc | 3 | ||||
| -rw-r--r-- | ash/wm/system_modal_container_layout_manager_unittest.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index a9c624a..4c0ca2f 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -23,6 +23,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/run_loop.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" @@ -155,7 +156,7 @@ class PanelLayoutManagerTest : public test::AshTestBase { void IsCalloutAboveLauncherIcon(aura::Window* panel) { // Flush the message loop, since callout updates use a delayed task. - MessageLoop::current()->RunUntilIdle(); + base::RunLoop().RunUntilIdle(); views::Widget* widget = GetCalloutWidgetForPanel(panel); Launcher* launcher = Launcher::ForPrimaryDisplay(); diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index d527cd0..f7d7373 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -11,6 +11,7 @@ #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" #include "base/compiler_specific.h" +#include "base/run_loop.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" @@ -280,7 +281,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, transient->Hide(); TestWindow::CloseTestWindow(transient.release()); - MessageLoopForUI::current()->RunUntilIdle(); + base::RunLoop().RunUntilIdle(); // parent should now be active again. EXPECT_TRUE(wm::IsActiveWindow(parent.get())); |