Moves ash::user::LoginStatus to ash/common

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

 // Copyright (c) 2012 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/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/login_status.h"
 #include "ash/test/shell_test_api.h"
@@ skipping 122 matching lines @@
   void DestroyMenuItem() {
     return tray()->DestroyDefaultView();
   }
 
   bool CanCreateMenuItem() {
     views::View* menu_item_view = CreateMenuItem();
     DestroyMenuItem();
     return menu_item_view != NULL;
   }
 
-  void SetLoginStatus(ash::user::LoginStatus status) {
+  void SetLoginStatus(ash::LoginStatus status) {
     tray()->UpdateAfterLoginStatusChange(status);
   }
 
-  ash::user::LoginStatus GetLoginStatus() {
-    return tray()->login_;
-  }
+  ash::LoginStatus GetLoginStatus() { return tray()->login_; }
 
   bool CreateDetailedMenu() {
     tray()->PopupDetailedView(0, false);
     return tray()->detailed_menu_ != NULL;
   }
 
   void CloseDetailMenu() {
     CHECK(tray()->detailed_menu_);
     tray()->DestroyDetailedView();
     tray()->detailed_menu_ = NULL;
@@ skipping 101 matching lines @@
     braille_controller_.SetAvailable(connected);
     braille_controller_.GetObserver()->OnBrailleDisplayStateChanged(
         *braille_controller_.GetDisplayState());
   }
 
   policy::MockConfigurationPolicyProvider provider_;
   MockBrailleController braille_controller_;
 };
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) {
-  EXPECT_EQ(ash::user::LOGGED_IN_NONE, GetLoginStatus());
+  EXPECT_EQ(ash::LoginStatus::NOT_LOGGED_IN, GetLoginStatus());
 
   user_manager::UserManager::Get()->UserLoggedIn(
       AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
       true);
   user_manager::UserManager::Get()->SessionStarted();
 
-  EXPECT_EQ(ash::user::LOGGED_IN_USER, GetLoginStatus());
+  EXPECT_EQ(ash::LoginStatus::USER, GetLoginStatus());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowTrayIcon) {
-  SetLoginStatus(ash::user::LOGGED_IN_NONE);
+  SetLoginStatus(ash::LoginStatus::NOT_LOGGED_IN);
 
   // Confirms that the icon is invisible before login.
   EXPECT_FALSE(IsTrayIconVisible());
 
   user_manager::UserManager::Get()->UserLoggedIn(
       AccountId::FromUserEmail("owner@invalid.domain"), "owner@invalid.domain",
       true);
   user_manager::UserManager::Get()->SessionStarted();
 
   // Confirms that the icon is invisible just after login.
@@ skipping 192 matching lines @@
   SetMagnifierEnabled(false);
   EXPECT_TRUE(CanCreateMenuItem());
 
   SetShowAccessibilityOptionsInSystemTrayMenu(false);
 
   // Confirms that the menu is invisible.
   EXPECT_FALSE(CanCreateMenuItem());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
-  SetLoginStatus(ash::user::LOGGED_IN_NONE);
+  SetLoginStatus(ash::LoginStatus::NOT_LOGGED_IN);
 
   // Confirms that the menu is visible.
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu remains visible regardless of toggling spoken feedback.
   AccessibilityManager::Get()->EnableSpokenFeedback(
       true, ui::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   AccessibilityManager::Get()->EnableSpokenFeedback(
       false, ui::A11Y_NOTIFICATION_NONE);
@@ skipping 84 matching lines @@
   EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
   EXPECT_EQ(BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED, GetNotificationText());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, KeepMenuVisibilityOnLockScreen) {
   // Enables high contrast mode.
   AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Locks the screen.
-  SetLoginStatus(ash::user::LOGGED_IN_LOCKED);
+  SetLoginStatus(ash::LoginStatus::LOCKED);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Disables high contrast mode.
   AccessibilityManager::Get()->EnableHighContrast(false);
 
   // Confirms that the menu is still visible.
   EXPECT_TRUE(CanCreateMenuItem());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ClickDetailMenu) {
-  SetLoginStatus(ash::user::LOGGED_IN_USER);
+  SetLoginStatus(ash::LoginStatus::USER);
 
   // Confirms that the check item toggles the spoken feedback.
   EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 
   EXPECT_TRUE(CreateDetailedMenu());
   ClickSpokenFeedbackOnDetailMenu();
   EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 
   EXPECT_TRUE(CreateDetailedMenu());
   ClickSpokenFeedbackOnDetailMenu();
@@ skipping 39 matching lines @@
   EXPECT_TRUE(CreateDetailedMenu());
   ClickVirtualKeyboardOnDetailMenu();
   EXPECT_TRUE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled());
 
   EXPECT_TRUE(CreateDetailedMenu());
   ClickVirtualKeyboardOnDetailMenu();
   EXPECT_FALSE(AccessibilityManager::Get()->IsVirtualKeyboardEnabled());
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
-  SetLoginStatus(ash::user::LOGGED_IN_NONE);
+  SetLoginStatus(ash::LoginStatus::NOT_LOGGED_IN);
 
   // At first, all of the check is unchecked.
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
   EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
   EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
   CloseDetailMenu();
@@ skipping 136 matching lines @@
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
   EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
   EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Autoclick is disabled on login screen.
-  SetLoginStatus(ash::user::LOGGED_IN_USER);
+  SetLoginStatus(ash::LoginStatus::USER);
 
   // Enabling autoclick.
   AccessibilityManager::Get()->EnableAutoclick(true);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
   EXPECT_TRUE(IsAutoclickEnabledOnDetailMenu());
   EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Disabling autoclick.
   AccessibilityManager::Get()->EnableAutoclick(false);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorEnabledOnDetailMenu());
   EXPECT_FALSE(IsAutoclickEnabledOnDetailMenu());
   EXPECT_FALSE(IsVirtualKeyboardEnabledOnDetailMenu());
   CloseDetailMenu();
 }
 
 IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, CheckMenuVisibilityOnDetailMenu) {
-  SetLoginStatus(ash::user::LOGGED_IN_NONE);
+  SetLoginStatus(ash::LoginStatus::NOT_LOGGED_IN);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_TRUE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_FALSE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
   EXPECT_FALSE(IsHelpShownOnDetailMenu());
   EXPECT_FALSE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 
-  SetLoginStatus(ash::user::LOGGED_IN_USER);
+  SetLoginStatus(ash::LoginStatus::USER);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHelpShownOnDetailMenu());
   EXPECT_TRUE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 
-  SetLoginStatus(ash::user::LOGGED_IN_LOCKED);
+  SetLoginStatus(ash::LoginStatus::LOCKED);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
   EXPECT_FALSE(IsHelpShownOnDetailMenu());
   EXPECT_FALSE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 
   ash::test::TestSessionStateDelegate* session_state_delegate =
       new ash::test::TestSessionStateDelegate;
   ash::test::ShellTestApi test_api(ash::Shell::GetInstance());
   test_api.SetSessionStateDelegate(session_state_delegate);
   session_state_delegate->SetUserAddingScreenRunning(true);
-  SetLoginStatus(ash::user::LOGGED_IN_USER);
+  SetLoginStatus(ash::LoginStatus::USER);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackMenuShownOnDetailMenu());
   EXPECT_TRUE(IsHighContrastMenuShownOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierMenuShownOnDetailMenu());
   EXPECT_FALSE(IsLargeCursorMenuShownOnDetailMenu());
   EXPECT_TRUE(IsAutoclickMenuShownOnDetailMenu());
   EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu());
   EXPECT_FALSE(IsHelpShownOnDetailMenu());
   EXPECT_FALSE(IsSettingsShownOnDetailMenu());
   CloseDetailMenu();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos