mash: Migrate SessionStateDelegate access to WmShell.

ash/system/user/tray_user_unittest.cc

Index: ash/system/user/tray_user_unittest.cc
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index 0cff5edd7916131974604215747f020c58eb1eda..0cd7a085322d1b80f905d958ed5310c03d976af9 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -13,6 +13,7 @@
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/user_view.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_helper.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/strings/utf_string_conversions.h"
@@ -26,7 +27,7 @@
 
 namespace ash {
 
-class TrayUserTest : public ash::test::AshTestBase {
+class TrayUserTest : public test::AshTestBase {
  public:
   TrayUserTest() = default;
 
@@ -47,16 +48,16 @@ class TrayUserTest : public ash::test::AshTestBase {
 
   // Accessors to various system components.
   SystemTray* tray() { return tray_; }
-  ash::test::TestSessionStateDelegate* delegate() { return delegate_; }
-  ash::TrayUser* tray_user(int index) { return tray_user_[index]; }
-  ash::TrayUserSeparator* tray_user_separator() { return tray_user_separator_; }
+  test::TestSessionStateDelegate* delegate() { return delegate_; }
+  TrayUser* tray_user(int index) { return tray_user_[index]; }
+  TrayUserSeparator* tray_user_separator() { return tray_user_separator_; }
 
  private:
   SystemTray* tray_ = nullptr;
-  ash::test::TestSessionStateDelegate* delegate_ = nullptr;
+  test::TestSessionStateDelegate* delegate_ = nullptr;
 
   // Note that the ownership of these items is on the shelf.
-  std::vector<ash::TrayUser*> tray_user_;
+  std::vector<TrayUser*> tray_user_;
 
   // The separator between the tray users and the rest of the menu.
   // Note: The item will get owned by the shelf.
@@ -66,10 +67,9 @@ class TrayUserTest : public ash::test::AshTestBase {
 };
 
 void TrayUserTest::SetUp() {
-  ash::test::AshTestBase::SetUp();
+  test::AshTestBase::SetUp();
   tray_ = Shell::GetPrimaryRootWindowController()->GetSystemTray();
-  delegate_ = static_cast<ash::test::TestSessionStateDelegate*>(
-      ash::Shell::GetInstance()->session_state_delegate());
+  delegate_ = test::AshTestHelper::GetTestSessionStateDelegate();
 }
 
 void TrayUserTest::InitializeParameters(int users_logged_in,
@@ -77,19 +77,18 @@ void TrayUserTest::InitializeParameters(int users_logged_in,
   // Set our default assumptions. Note that it is sufficient to set these
   // after everything was created.
   delegate_->set_logged_in_users(users_logged_in);
-  ash::test::TestShellDelegate* shell_delegate =
-      static_cast<ash::test::TestShellDelegate*>(
-          ash::Shell::GetInstance()->delegate());
+  test::TestShellDelegate* shell_delegate =
+      static_cast<test::TestShellDelegate*>(Shell::GetInstance()->delegate());
   shell_delegate->set_multi_profiles_enabled(multiprofile);
 
   // Instead of using the existing tray panels we create new ones which makes
   // the access easier.
   for (int i = 0; i < delegate_->GetMaximumNumberOfLoggedInUsers(); i++) {
-    tray_user_.push_back(new ash::TrayUser(tray_, i));
+    tray_user_.push_back(new TrayUser(tray_, i));
     tray_->AddTrayItem(tray_user_[i]);
   }
   // We then add also the separator.
-  tray_user_separator_ = new ash::TrayUserSeparator(tray_);
+  tray_user_separator_ = new TrayUserSeparator(tray_);
   tray_->AddTrayItem(tray_user_separator_);
 }
 
@@ -137,7 +136,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
   EXPECT_FALSE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-    EXPECT_EQ(ash::TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
+    EXPECT_EQ(TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
   EXPECT_FALSE(tray_user_separator()->separator_shown());
 
   ShowTrayMenu(&generator);
@@ -146,7 +145,7 @@ TEST_F(TrayUserTest, SingleUserModeDoesNotAllowAddingUser) {
   EXPECT_TRUE(tray()->IsAnyBubbleVisible());
 
   for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-    EXPECT_EQ(i == 0 ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
+    EXPECT_EQ(i == 0 ? TrayUser::SHOWN : TrayUser::HIDDEN,
               tray_user(i)->GetStateForTest());
   EXPECT_FALSE(tray_user_separator()->separator_shown());
   tray()->CloseSystemBubble();
@@ -213,7 +212,7 @@ TEST_F(TrayUserTest, MutiUserModeDoesNotAllowToAddUser) {
     EXPECT_TRUE(tray()->HasSystemBubble());
     EXPECT_TRUE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < max_users; i++) {
-      EXPECT_EQ(i < j ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
+      EXPECT_EQ(i < j ? TrayUser::SHOWN : TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
@@ -222,28 +221,27 @@ TEST_F(TrayUserTest, MutiUserModeDoesNotAllowToAddUser) {
 
     // Move the mouse over the user item and it should hover.
     MoveOverUserItem(&generator, 0);
-    EXPECT_EQ(ash::TrayUser::HOVERED, tray_user(0)->GetStateForTest());
+    EXPECT_EQ(TrayUser::HOVERED, tray_user(0)->GetStateForTest());
     for (int i = 1; i < max_users; i++) {
-      EXPECT_EQ(i < j ? ash::TrayUser::SHOWN : ash::TrayUser::HIDDEN,
+      EXPECT_EQ(i < j ? TrayUser::SHOWN : TrayUser::HIDDEN,
                 tray_user(i)->GetStateForTest());
     }
 
     // Check that clicking the button allows to add item if we have still room
     // for one more user.
     ClickUserItem(&generator, 0);
-    EXPECT_EQ(j == max_users ? ash::TrayUser::ACTIVE_BUT_DISABLED
-                             : ash::TrayUser::ACTIVE,
+    EXPECT_EQ(j == max_users ? TrayUser::ACTIVE_BUT_DISABLED : TrayUser::ACTIVE,
               tray_user(0)->GetStateForTest());
 
     // Click the button again to see that the menu goes away.
     ClickUserItem(&generator, 0);
-    EXPECT_EQ(ash::TrayUser::HOVERED, tray_user(0)->GetStateForTest());
+    EXPECT_EQ(TrayUser::HOVERED, tray_user(0)->GetStateForTest());
 
     // Close and check that everything is deleted.
     tray()->CloseSystemBubble();
     EXPECT_FALSE(tray()->IsAnyBubbleVisible());
     for (int i = 0; i < delegate()->GetMaximumNumberOfLoggedInUsers(); i++)
-      EXPECT_EQ(ash::TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
+      EXPECT_EQ(TrayUser::HIDDEN, tray_user(i)->GetStateForTest());
   }
 }