mash: Run pre-unlock animation via SessionController

ash/shell_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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/session/session_controller.h"
@@ skipping 146 matching lines @@
   void LockScreenAndVerifyMenuClosed() {
     // Verify a menu is open before locking.
     views::MenuController* menu_controller =
         views::MenuController::GetActiveInstance();
     DCHECK(menu_controller);
     EXPECT_EQ(views::MenuController::EXIT_NONE, menu_controller->exit_type());
 
     // Create a LockScreen window.
     views::Widget::InitParams widget_params(
         views::Widget::InitParams::TYPE_WINDOW);
-    SessionController* controller = Shell::Get()->session_controller();
-    controller->LockScreenAndFlushForTest();
     views::Widget* lock_widget = CreateTestWindow(widget_params);
     Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                         kShellWindowId_LockScreenContainer)
         ->AddChild(lock_widget->GetNativeView());
     lock_widget->Show();
+
+    // Simulate real screen locker to change session state to LOCKED
+    // when it is shown.
+    SessionController* controller = Shell::Get()->session_controller();
+    controller->LockScreenAndFlushForTest();
+
     EXPECT_TRUE(controller->IsScreenLocked());
     EXPECT_TRUE(lock_widget->GetNativeView()->HasFocus());
 
     // Verify menu is closed.
     EXPECT_EQ(nullptr, views::MenuController::GetActiveInstance());
     lock_widget->Close();
     GetSessionControllerClient()->UnlockScreen();
   }
 };
 
@@ skipping 327 matching lines @@
   // the case with classic-ash where embedders can separately create
   // aura::Windows.
   if (WmShell::Get()->IsRunningInMash())
     return;
 
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash