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

Unified Diff: chrome/browser/chromeos/login/ui/user_adding_screen_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/ui/user_adding_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
index b76c90bf52a8c9054c7448a12231f0b17ad6316c..5e22d4554a2a9368bb083f691d96b177a484dd4f 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -92,15 +92,15 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(1);
- EXPECT_EQ(3u, UserManager::Get()->GetUsers().size());
- EXPECT_EQ(0u, UserManager::Get()->GetLoggedInUsers().size());
+ EXPECT_EQ(3u, GetUserManager()->GetUsers().size());
+ EXPECT_EQ(0u, GetUserManager()->GetLoggedInUsers().size());
EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
ash::Shell::GetInstance()->session_state_delegate()->
GetSessionState());
LoginUser(kTestUsers[0]);
- EXPECT_EQ(1u, UserManager::Get()->GetLoggedInUsers().size());
+ EXPECT_EQ(1u, GetUserManager()->GetLoggedInUsers().size());
EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
ash::Shell::GetInstance()->session_state_delegate()->
GetSessionState());
@@ -120,8 +120,8 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
GetSessionState());
EXPECT_TRUE(LoginDisplayHostImpl::default_host() == NULL);
- EXPECT_EQ(1u, UserManager::Get()->GetLoggedInUsers().size());
- EXPECT_EQ(kTestUsers[0], UserManager::Get()->GetActiveUser()->email());
+ EXPECT_EQ(1u, GetUserManager()->GetLoggedInUsers().size());
+ EXPECT_EQ(kTestUsers[0], GetUserManager()->GetActiveUser()->email());
}
IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
ash::Shell::GetInstance()->session_state_delegate()->
GetSessionState());
- UserManager* user_manager = UserManager::Get();
+ UserManager* user_manager = GetUserManager();
for (int i = 1; i < 3; ++i) {
UserAddingScreen::Get()->Start();
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698