ash: Use session_manager::SessionState

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

 // Copyright 2014 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 "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
@@ skipping 93 matching lines @@
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 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);
   EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
   EXPECT_EQ(kTestUsers[0],
             user_manager::UserManager::Get()->GetActiveUser()->email());
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 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();
 
   for (int i = 1; i < 3; ++i) {
     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.
   PrefService* prefs1 =
       ProfileHelper::Get()
           ->GetProfileByUserUnsafe(user_manager->GetLoggedInUsers()[0])
           ->GetPrefs();
   PrefService* prefs2 =
       ProfileHelper::Get()
           ->GetProfileByUserUnsafe(user_manager->GetLoggedInUsers()[1])
@@ skipping 91 matching lines @@
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   CheckScreenIsVisible();
   UserAddingScreen::Get()->Cancel();
   WaitUntilUserAddingFinishedOrCancelled();
   content::RunAllPendingInMessageLoop();
 }
 
 }  // namespace chromeos