reland -- Disable animations during aura tests.

ash/wm/system_modal_container_layout_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/system_modal_container_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ash/wm/window_util.h"
@@ skipping 150 matching lines @@
   EXPECT_TRUE(IsActiveWindow(t2));
 
   // Both transients should be destroyed with parent.
   parent.reset();
   EXPECT_TRUE(do1.destroyed());
   EXPECT_TRUE(do2.destroyed());
 }
 
 // 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));
   // parent should be active.
   EXPECT_TRUE(IsActiveWindow(parent.get()));
 
   scoped_ptr<aura::Window> transient(
       TestWindow::OpenTestWindow(parent.get(), true));
   // t1 should now be active.
   EXPECT_TRUE(IsActiveWindow(transient.get()));
 
   // Attempting to click the parent should result in no activation change.
   aura::test::EventGenerator e1(parent.get());
   e1.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(transient.get()));
 
   // Now close the transient.
   transient.reset();
 
+  MessageLoopForUI::current()->RunAllPending();
+
   // parent should now be active again.
   EXPECT_TRUE(IsActiveWindow(parent.get()));
 
   // Attempting to click unrelated should activate it.
   aura::test::EventGenerator e2(unrelated.get());
   e2.ClickLeftButton();
   EXPECT_TRUE(IsActiveWindow(unrelated.get()));
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest,
@@ skipping 33 matching lines @@
   EXPECT_EQ(1, main_delegate->mouse_presses());
 
   // Verify that none of the other containers received any more mouse presses.
   EXPECT_EQ(1, transient_delegate->mouse_presses());
   EXPECT_EQ(1, lock_delegate->mouse_presses());
   EXPECT_EQ(1, lock_modal_delegate->mouse_presses());
 }
 
 }  // namespace test
 }  // namespace ash