ash: Use session_manager::SessionState

chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

Index: chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
index 2dbed90870fc1d932b431608811872e1fc753f8f..63b95c03a1c35d4a170ee1a001217043ad8861aa 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -111,25 +111,25 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
   EXPECT_EQ(3u, user_manager::UserManager::Get()->GetUsers().size());
   EXPECT_EQ(0u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
+  EXPECT_EQ(session_manager::SessionState::LOGIN_PRIMARY,
             ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   LoginUser(kTestUsers[0]);
   EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
+  EXPECT_EQ(session_manager::SessionState::ACTIVE,
             ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_started());
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
+  EXPECT_EQ(session_manager::SessionState::LOGIN_SECONDARY,
             ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   UserAddingScreen::Get()->Cancel();
   WaitUntilUserAddingFinishedOrCancelled();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_finished());
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
+  EXPECT_EQ(session_manager::SessionState::ACTIVE,
             ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   EXPECT_TRUE(LoginDisplayHost::default_host() == nullptr);
@@ -147,10 +147,10 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
   ash::WmShell* wm_shell = ash::WmShell::Get();
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
+  EXPECT_EQ(session_manager::SessionState::LOGIN_PRIMARY,
             wm_shell->GetSessionStateDelegate()->GetSessionState());
   LoginUser(kTestUsers[0]);
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
+  EXPECT_EQ(session_manager::SessionState::ACTIVE,
             wm_shell->GetSessionStateDelegate()->GetSessionState());
 
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
@@ -159,19 +159,19 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
     UserAddingScreen::Get()->Start();
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(i, user_adding_started());
-    EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
+    EXPECT_EQ(session_manager::SessionState::LOGIN_SECONDARY,
               wm_shell->GetSessionStateDelegate()->GetSessionState());
     AddUser(kTestUsers[i]);
     WaitUntilUserAddingFinishedOrCancelled();
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(i, user_adding_finished());
-    EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
+    EXPECT_EQ(session_manager::SessionState::ACTIVE,
               wm_shell->GetSessionStateDelegate()->GetSessionState());
     EXPECT_TRUE(LoginDisplayHost::default_host() == nullptr);
     ASSERT_EQ(unsigned(i + 1), user_manager->GetLoggedInUsers().size());
   }
 
-  EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
+  EXPECT_EQ(session_manager::SessionState::ACTIVE,
             wm_shell->GetSessionStateDelegate()->GetSessionState());
 
   // Now check how unlock policy works for these users.