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

Unified Diff: chrome/browser/chromeos/login/saml/saml_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/saml/saml_browsertest.cc
diff --git a/chrome/browser/chromeos/login/saml/saml_browsertest.cc b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
index 3d57dc549ec83f5da4fd188c0da11ad37f37d868..1785ba20f587486c500d795d0413bb72c6a380d1 100644
--- a/chrome/browser/chromeos/login/saml/saml_browsertest.cc
+++ b/chrome/browser/chromeos/login/saml/saml_browsertest.cc
@@ -528,7 +528,7 @@ IN_PROC_BROWSER_TEST_F(SamlTest, UseAutenticatedUserEmailAddress) {
content::WindowedNotificationObserver(
chrome::NOTIFICATION_SESSION_STARTED,
content::NotificationService::AllSources()).Wait();
- const User* user = UserManager::Get()->GetActiveUser();
+ const User* user = GetUserManager()->GetActiveUser();
ASSERT_TRUE(user);
EXPECT_EQ(kFirstSAMLUserEmail, user->email());
}
@@ -644,10 +644,10 @@ void SAMLPolicyTest::SetUpOnMainThread() {
SamlTest::SetUpOnMainThread();
// Pretend that the test users' OAuth tokens are valid.
- UserManager::Get()->SaveUserOAuthStatus(kFirstSAMLUserEmail,
- User::OAUTH2_TOKEN_STATUS_VALID);
- UserManager::Get()->SaveUserOAuthStatus(kNonSAMLUserEmail,
- User::OAUTH2_TOKEN_STATUS_VALID);
+ GetUserManager()->SaveUserOAuthStatus(kFirstSAMLUserEmail,
+ User::OAUTH2_TOKEN_STATUS_VALID);
+ GetUserManager()->SaveUserOAuthStatus(kNonSAMLUserEmail,
+ User::OAUTH2_TOKEN_STATUS_VALID);
}
void SAMLPolicyTest::SetSAMLOfflineSigninTimeLimitPolicy(int limit) {

Powered by Google App Engine
This is Rietveld 408576698