Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Unified Diff: ash/root_window_controller_unittest.cc

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 64bb60ae6b870c92b03d326685441cc10960b2c3..718955ddfe69d8a4bf6cf79145baffa16cf43338 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -371,7 +371,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
UpdateDisplay("600x600");
Shell* shell = Shell::GetInstance();
RootWindowController* controller = shell->GetPrimaryRootWindowController();
- EXPECT_EQ(user::LOGGED_IN_USER,
+ EXPECT_EQ(LoginStatus::USER,
shell->system_tray_delegate()->GetUserLoginStatus());
EXPECT_EQ(controller->GetContainer(kShellWindowId_SystemModalContainer)
->layout_manager(),
@@ -385,7 +385,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
session_modal_widget->GetNativeView()));
shell->session_state_delegate()->LockScreen();
- EXPECT_EQ(user::LOGGED_IN_LOCKED,
+ EXPECT_EQ(LoginStatus::LOCKED,
shell->system_tray_delegate()->GetUserLoginStatus());
EXPECT_EQ(controller->GetContainer(kShellWindowId_LockSystemModalContainer)
->layout_manager(),
@@ -413,7 +413,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
// Configure login screen environment.
SetUserLoggedIn(false);
- EXPECT_EQ(user::LOGGED_IN_NONE,
+ EXPECT_EQ(LoginStatus::NOT_LOGGED_IN,
shell->system_tray_delegate()->GetUserLoginStatus());
EXPECT_EQ(0, shell->session_state_delegate()->NumberOfLoggedInUsers());
EXPECT_FALSE(shell->session_state_delegate()->IsActiveUserSessionStarted());
@@ -436,7 +436,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
// Configure user session environment.
SetUserLoggedIn(true);
SetSessionStarted(true);
- EXPECT_EQ(user::LOGGED_IN_USER,
+ EXPECT_EQ(LoginStatus::USER,
shell->system_tray_delegate()->GetUserLoginStatus());
EXPECT_EQ(1, shell->session_state_delegate()->NumberOfLoggedInUsers());
EXPECT_TRUE(shell->session_state_delegate()->IsActiveUserSessionStarted());
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698