Index: chrome/browser/chromeos/login/login_utils_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
index 7dd9a508f2f039e024605d8acd3c1ec1f5450076..f9496627b55b4e3d875037830e382dc70a5052bf 100644 |
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc |
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc |
@@ -376,7 +376,7 @@ class LoginUtilsBlockingLoginTest |
TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) { |
UserManager* user_manager = UserManager::Get(); |
- EXPECT_FALSE(user_manager->user_is_logged_in()); |
+ EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
EXPECT_FALSE(connector_->IsEnterpriseManaged()); |
EXPECT_FALSE(prepared_profile_); |
@@ -384,20 +384,20 @@ TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) { |
PrepareProfile(kUsername); |
EXPECT_TRUE(prepared_profile_); |
- EXPECT_TRUE(user_manager->user_is_logged_in()); |
- EXPECT_EQ(kUsername, user_manager->logged_in_user().email()); |
+ EXPECT_TRUE(user_manager->IsUserLoggedIn()); |
+ EXPECT_EQ(kUsername, user_manager->GetLoggedInUser().email()); |
} |
TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) { |
UserManager* user_manager = UserManager::Get(); |
- EXPECT_FALSE(user_manager->user_is_logged_in()); |
+ EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
EXPECT_FALSE(connector_->IsEnterpriseManaged()); |
EXPECT_FALSE(prepared_profile_); |
// Enroll the device. |
LockDevice(kUsername); |
- EXPECT_FALSE(user_manager->user_is_logged_in()); |
+ EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
EXPECT_TRUE(connector_->IsEnterpriseManaged()); |
EXPECT_EQ(kDomain, connector_->GetEnterpriseDomain()); |
EXPECT_FALSE(prepared_profile_); |
@@ -406,20 +406,20 @@ TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) { |
PrepareProfile(kUsernameOtherDomain); |
EXPECT_TRUE(prepared_profile_); |
- EXPECT_TRUE(user_manager->user_is_logged_in()); |
- EXPECT_EQ(kUsernameOtherDomain, user_manager->logged_in_user().email()); |
+ EXPECT_TRUE(user_manager->IsUserLoggedIn()); |
+ EXPECT_EQ(kUsernameOtherDomain, user_manager->GetLoggedInUser().email()); |
} |
TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) { |
UserManager* user_manager = UserManager::Get(); |
- EXPECT_FALSE(user_manager->user_is_logged_in()); |
+ EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
EXPECT_FALSE(connector_->IsEnterpriseManaged()); |
EXPECT_FALSE(prepared_profile_); |
// Enroll the device. |
LockDevice(kUsername); |
- EXPECT_FALSE(user_manager->user_is_logged_in()); |
+ EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
EXPECT_TRUE(connector_->IsEnterpriseManaged()); |
EXPECT_EQ(kDomain, connector_->GetEnterpriseDomain()); |
EXPECT_FALSE(prepared_profile_); |
@@ -428,7 +428,7 @@ TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) { |
PrepareProfile(kUsername); |
EXPECT_FALSE(prepared_profile_); |
- EXPECT_TRUE(user_manager->user_is_logged_in()); |
+ EXPECT_TRUE(user_manager->IsUserLoggedIn()); |
GaiaUrls* gaia_urls = GaiaUrls::GetInstance(); |
TestURLFetcher* fetcher; |