| Index: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
|
| index 8f49280c81523b0d359983e1d8da37d10bfafd42..cd1be53256ecc0955495b681c5867efe9fd7b262 100644
|
| --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
|
| +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
|
| @@ -2,8 +2,8 @@
|
| // 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 "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/command_line.h"
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "components/signin/core/account_id/account_id.h"
|
| #include "components/user_manager/fake_user_manager.h"
|
| +#include "ui/aura/window.h"
|
| #include "ui/base/models/menu_model.h"
|
| #include "ui/base/ui_base_types.h"
|
|
|
| @@ -43,13 +44,6 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {
|
| return multi_user_window_manager_;
|
| }
|
|
|
| - void SetNumberOfUsers(int users) {
|
| - ash::test::TestSessionStateDelegate* delegate =
|
| - static_cast<ash::test::TestSessionStateDelegate*>(
|
| - ash::Shell::GetInstance()->session_state_delegate());
|
| - delegate->set_logged_in_users(users);
|
| - }
|
| -
|
| private:
|
| // A window which can be used for testing.
|
| aura::Window* window_;
|
| @@ -88,7 +82,7 @@ TEST_F(MultiUserContextMenuChromeOSTest, UnownedWindow) {
|
| EXPECT_EQ(NULL, CreateMultiUserContextMenu(window()).get());
|
|
|
| // Add more users.
|
| - SetNumberOfUsers(2);
|
| + AshTestHelper::GetTestSessionStateDelegate()->set_logged_in_users(2);
|
| EXPECT_EQ(NULL, CreateMultiUserContextMenu(window()).get());
|
| }
|
|
|
| @@ -102,13 +96,13 @@ TEST_F(MultiUserContextMenuChromeOSTest, OwnedWindow) {
|
|
|
| // After adding another user a menu should get created.
|
| {
|
| - SetNumberOfUsers(2);
|
| + AshTestHelper::GetTestSessionStateDelegate()->set_logged_in_users(2);
|
| std::unique_ptr<ui::MenuModel> menu = CreateMultiUserContextMenu(window());
|
| ASSERT_TRUE(menu.get());
|
| EXPECT_EQ(1, menu.get()->GetItemCount());
|
| }
|
| {
|
| - SetNumberOfUsers(3);
|
| + AshTestHelper::GetTestSessionStateDelegate()->set_logged_in_users(3);
|
| std::unique_ptr<ui::MenuModel> menu = CreateMultiUserContextMenu(window());
|
| ASSERT_TRUE(menu.get());
|
| EXPECT_EQ(2, menu.get()->GetItemCount());
|
|
|