Index: ash/metrics/user_metrics_recorder_unittest.cc |
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc |
index 93dd0c40ccfeb4115e8ff87848313c0544b9635e..e4f15437b43ea552ed96acd654b5ccfab6788b67 100644 |
--- a/ash/metrics/user_metrics_recorder_unittest.cc |
+++ b/ash/metrics/user_metrics_recorder_unittest.cc |
@@ -46,7 +46,7 @@ class UserMetricsRecorderTest : public test::AshTestBase { |
void TearDown() override; |
// Sets the user login status. |
- void SetLoginStatus(user::LoginStatus login_status); |
+ void SetLoginStatus(LoginStatus login_status); |
// Sets the current user session to be active or inactive in a desktop |
// environment. |
@@ -92,18 +92,18 @@ void UserMetricsRecorderTest::TearDown() { |
test::AshTestBase::TearDown(); |
} |
-void UserMetricsRecorderTest::SetLoginStatus(user::LoginStatus login_status) { |
+void UserMetricsRecorderTest::SetLoginStatus(LoginStatus login_status) { |
test_system_tray_delegate_->SetLoginStatus(login_status); |
} |
void UserMetricsRecorderTest::SetUserInActiveDesktopEnvironment( |
bool is_active) { |
if (is_active) { |
- SetLoginStatus(user::LOGGED_IN_USER); |
+ SetLoginStatus(LoginStatus::USER); |
ASSERT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
} else { |
- SetLoginStatus(user::LOGGED_IN_LOCKED); |
+ SetLoginStatus(LoginStatus::LOCKED); |
ASSERT_FALSE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
} |
@@ -118,35 +118,35 @@ aura::Window* UserMetricsRecorderTest::CreateTestWindow() { |
// Verifies the return value of IsUserInActiveDesktopEnvironment() for the |
// different login status values. |
TEST_F(UserMetricsRecorderTest, VerifyIsUserInActiveDesktopEnvironmentValues) { |
- SetLoginStatus(user::LOGGED_IN_NONE); |
+ SetLoginStatus(LoginStatus::NOT_LOGGED_IN); |
EXPECT_FALSE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_LOCKED); |
+ SetLoginStatus(LoginStatus::LOCKED); |
EXPECT_FALSE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_USER); |
+ SetLoginStatus(LoginStatus::USER); |
EXPECT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_OWNER); |
+ SetLoginStatus(LoginStatus::OWNER); |
EXPECT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_GUEST); |
+ SetLoginStatus(LoginStatus::GUEST); |
EXPECT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_PUBLIC); |
+ SetLoginStatus(LoginStatus::PUBLIC); |
EXPECT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_SUPERVISED); |
+ SetLoginStatus(LoginStatus::SUPERVISED); |
EXPECT_TRUE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
- SetLoginStatus(user::LOGGED_IN_KIOSK_APP); |
+ SetLoginStatus(LoginStatus::KIOSK_APP); |
EXPECT_FALSE( |
user_metrics_recorder_test_api()->IsUserInActiveDesktopEnvironment()); |
} |