Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5012)

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 4437e5352d412e8ee4a6aad21172b1f923bd4f9e..eff55c9b603169d5214b96967714864d10b03b43 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -533,7 +533,7 @@ class LoginUtilsBlockingLoginTest
public testing::WithParamInterface<int> {};
TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
EXPECT_FALSE(user_manager->IsUserLoggedIn());
EXPECT_FALSE(connector_->IsEnterpriseManaged());
EXPECT_FALSE(prepared_profile_);
@@ -549,7 +549,7 @@ TEST_F(LoginUtilsTest, NormalLoginDoesntBlock) {
}
TEST_F(LoginUtilsTest, EnterpriseLoginDoesntBlockForNormalUser) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
EXPECT_FALSE(user_manager->IsUserLoggedIn());
EXPECT_FALSE(connector_->IsEnterpriseManaged());
EXPECT_FALSE(prepared_profile_);
@@ -599,7 +599,7 @@ TEST_F(LoginUtilsTest, RlzInitialized) {
#endif
TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
EXPECT_FALSE(user_manager->IsUserLoggedIn());
EXPECT_FALSE(connector_->IsEnterpriseManaged());
EXPECT_FALSE(prepared_profile_);

Powered by Google App Engine
This is Rietveld 408576698