mash: Run pre-unlock animation via SessionController

chrome/browser/notifications/login_state_notification_blocker_chromeos_unittest.cc

 // Copyright 2013 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 "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 
 #include <memory>
 
 #include "ash/common/system/system_notifier.h"
 #include "ash/shell.h"
@@ skipping 47 matching lines @@
   bool ShouldShowNotificationAsPopup(
       const message_center::NotifierId& notifier_id) {
     message_center::Notification notification(
         message_center::NOTIFICATION_TYPE_SIMPLE, "chromeos-id",
         UTF8ToUTF16("chromeos-title"), UTF8ToUTF16("chromeos-message"),
         gfx::Image(), UTF8ToUTF16("chromeos-source"), GURL(),
         notifier_id, message_center::RichNotificationData(), NULL);
     return blocker_->ShouldShowNotificationAsPopup(notification);
   }
 
+  void SetLockedState(bool locked) {
+    // TODO(xiyuan): Use SessionManager and not call ash.
+    static_cast<ash::SessionStateObserver*>(ash::Shell::Get())

[stevenjb, 2017/04/10 15:52:44]

Why do we need the static_cast here?

[xiyuan, 2017/04/10 16:09:53]

It is because LockStateChanged is now part of SessionStateObserver interface.
And Shell declared the interface in its private section. I moved
LockStateChanged to there. Hence, needed the cast. It is temporary. I will
update the test to not depend on ash.

+        ->LockStateChanged(locked);
+  }
+
  private:
   int state_changed_count_;
   std::unique_ptr<message_center::NotificationBlocker> blocker_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginStateNotificationBlockerChromeOSTest);
 };
 
 TEST_F(LoginStateNotificationBlockerChromeOSTest, BaseTest) {
   // Default status: OOBE.
   message_center::NotifierId notifier_id(
       message_center::NotifierId::APPLICATION, "test-notifier");
   EXPECT_FALSE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Login screen.
   chromeos::LoginState::Get()->SetLoggedInState(
       chromeos::LoginState::LOGGED_IN_NONE,
       chromeos::LoginState::LOGGED_IN_USER_NONE);
   EXPECT_EQ(0, GetStateChangedCountAndReset());
   EXPECT_FALSE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Logged in as a normal user.
   chromeos::LoginState::Get()->SetLoggedInState(
       chromeos::LoginState::LOGGED_IN_ACTIVE,
       chromeos::LoginState::LOGGED_IN_USER_REGULAR);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Lock.
-  ash::Shell::Get()->OnLockStateChanged(true);
+  SetLockedState(true);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_FALSE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Unlock.
-  ash::Shell::Get()->OnLockStateChanged(false);
+  SetLockedState(false);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 }
 
 TEST_F(LoginStateNotificationBlockerChromeOSTest, AlwaysAllowedNotifier) {
   // NOTIFIER_DISPLAY is allowed to shown in the login screen.
   message_center::NotifierId notifier_id(
       message_center::NotifierId::SYSTEM_COMPONENT,
       ash::system_notifier::kNotifierDisplay);
 
   // Default status: OOBE.
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Login screen.
   chromeos::LoginState::Get()->SetLoggedInState(
       chromeos::LoginState::LOGGED_IN_NONE,
       chromeos::LoginState::LOGGED_IN_USER_NONE);
   EXPECT_EQ(0, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Logged in as a normal user.
   chromeos::LoginState::Get()->SetLoggedInState(
       chromeos::LoginState::LOGGED_IN_ACTIVE,
       chromeos::LoginState::LOGGED_IN_USER_REGULAR);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Lock.
-  ash::Shell::Get()->OnLockStateChanged(true);
+  SetLockedState(true);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Unlock.
-  ash::Shell::Get()->OnLockStateChanged(false);
+  SetLockedState(false);
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 }