mash: Run pre-unlock animation via SessionController

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/common/wm/system_modal_container_layout_manager.h"
 
 #include <memory>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/container_finder.h"
@@ skipping 340 matching lines @@
       transient_delegate->OpenTestWindowWithParent(main.get());
   EXPECT_TRUE(wm::IsActiveWindow(transient));
   e1.ClickLeftButton();
   EXPECT_EQ(1, transient_delegate->mouse_presses());
 
   for (int block_reason = FIRST_BLOCK_REASON;
        block_reason < NUMBER_OF_BLOCK_REASONS; ++block_reason) {
     // Create a window in the lock screen container and ensure that it receives
     // the mouse event instead of the modal window (crbug.com/110920).
     BlockUserSession(static_cast<UserSessionBlockReason>(block_reason));
+
     EventTestWindow* lock_delegate = new EventTestWindow(false);
     std::unique_ptr<aura::Window> lock(lock_delegate->OpenTestWindowWithParent(
         Shell::GetPrimaryRootWindowController()->GetContainer(
             ash::kShellWindowId_LockScreenContainer)));
+    // BlockUserSession could change the workspace size. Make sure |lock| has
+    // the same bounds as |main| so that |lock| gets the generated mouse events.
+    lock->SetBounds(main->bounds());
     EXPECT_TRUE(wm::IsActiveWindow(lock.get()));
     e1.ClickLeftButton();
     EXPECT_EQ(1, lock_delegate->mouse_presses());
 
     // Make sure that a modal container created by the lock screen can still
     // receive mouse events.
     EventTestWindow* lock_modal_delegate = new EventTestWindow(true);
     aura::Window* lock_modal =
         lock_modal_delegate->OpenTestWindowWithParent(lock.get());
     EXPECT_TRUE(wm::IsActiveWindow(lock_modal));
     e1.ClickLeftButton();
     // Verify that none of the other containers received any more mouse presses.
     EXPECT_EQ(1, lock_modal_delegate->mouse_presses());
     EXPECT_EQ(1, lock_delegate->mouse_presses());
     EXPECT_EQ(1, main_delegate->mouse_presses());
     EXPECT_EQ(1, transient_delegate->mouse_presses());
+
+    // Close |lock| before unlocking so that Shell::OnLockStateChanged does
+    // not DCHECK on finding a system modal in Lock layer when unlocked.
+    lock.reset();
+
     UnblockUserSession();
   }
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, ModalTransientChildEvents) {
   // Create a normal window and attempt to receive a click event.
   EventTestWindow* main_delegate = new EventTestWindow(false);
   std::unique_ptr<aura::Window> main(
       main_delegate->OpenTestWindowWithContext(CurrentContext()));
   EXPECT_TRUE(wm::IsActiveWindow(main.get()));
@@ skipping 183 matching lines @@
     TestWindow::CloseTestWindow(lock_modal_window.release());
 
     // Normal system modal window while blocked, but it belongs to the normal
     // window.  Shouldn't show blocked system modal background, but normal.
     std::unique_ptr<aura::Window> modal_window(
         OpenTestWindowWithParent(parent.get(), true));
     modal_window->Show();
     EXPECT_TRUE(AllRootWindowsHaveModalBackgrounds());
     EXPECT_FALSE(AllRootWindowsHaveLockedModalBackgrounds());
     TestWindow::CloseTestWindow(modal_window.release());
+
+    // Close |lock_parent| before unlocking so that Shell::OnLockStateChanged
+    // does not DCHECK on finding a system modal in Lock layer when unlocked.
+    lock_parent.reset();
+
     UnblockUserSession();
     // Here we should check the behavior of the locked system modal dialog when
     // unlocked, but such case isn't handled very well right now.
     // See crbug.com/157660
     // TODO(mukai): add the test case when the bug is fixed.
   }
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, MultiDisplays) {
   UpdateDisplay("500x500,500x500");
@@ skipping 314 matching lines @@
 
 // Make sure that events are properly blocked in multi displays environment.
 TEST_F(SystemModalContainerLayoutManagerTest, BlockEventsInMultiDisplays) {
   UpdateDisplay("500x500, 500x500");
   InputTestDelegate delegate;
   delegate.RunTest(this);
 }
 
 }  // namespace test
 }  // namespace ash