summaryrefslogtreecommitdiffstats
path: root/ash/wm/system_modal_container_layout_manager_unittest.cc
diff options
context:
space:
mode:
authorvollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 17:19:22 +0000
committervollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 17:19:22 +0000
commitc3287f6e7f7c23c1f20729d4729ffdd84658c4b7 (patch)
treed3cd8bb3f63836aaa4058e2834c8ba28791ffc23 /ash/wm/system_modal_container_layout_manager_unittest.cc
parent32b9c269a98692acf748f7594425d586e838cf96 (diff)
downloadchromium_src-c3287f6e7f7c23c1f20729d4729ffdd84658c4b7.zip
chromium_src-c3287f6e7f7c23c1f20729d4729ffdd84658c4b7.tar.gz
chromium_src-c3287f6e7f7c23c1f20729d4729ffdd84658c4b7.tar.bz2
Disable animations during aura tests.
This causes all animations scheduled during a test to complete immediately. After making this change, I noticed some code assumed that animations would not complete synchronously. Some of this code used animation observers, and I while fixing the code I have updated it to use the preferred ImplicitAnimationObserver. BUG=None TEST=aura_shell_unittests,aura_unittests,compositor_unittests Review URL: https://chromiumcodereview.appspot.com/9222018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/system_modal_container_layout_manager_unittest.cc')
-rw-r--r--ash/wm/system_modal_container_layout_manager_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 04198ea..e3be65d 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -168,10 +168,8 @@ TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) {
// Tests that we can activate an unrelated window after a modal window is closed
// for a window.
-// TODO(beng): This test is disabled pending a solution re: visibility & target
-// visibility.
TEST_F(SystemModalContainerLayoutManagerTest,
- DISABLED_CanActivateAfterEndModalSession) {
+ CanActivateAfterEndModalSession) {
scoped_ptr<aura::Window> unrelated(TestWindow::OpenTestWindow(NULL, false));
unrelated->SetBounds(gfx::Rect(100, 100, 50, 50));
scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false));
@@ -191,6 +189,8 @@ TEST_F(SystemModalContainerLayoutManagerTest,
// Now close the transient.
transient.reset();
+ MessageLoopForUI::current()->RunAllPending();
+
// parent should now be active again.
EXPECT_TRUE(IsActiveWindow(parent.get()));