Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
@@ skipping 74 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 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());
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_started());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
 
   UserAddingScreen::Get()->Cancel();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_finished());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             ash::Shell::GetInstance()->session_state_delegate()->
                 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) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
   EXPECT_CALL(login_utils(), DoBrowserLaunch(_, _)).Times(3);
   LoginUser(kTestUsers[0]);
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             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();
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(i, user_adding_started());
     EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
               ash::Shell::GetInstance()->session_state_delegate()->
                   GetSessionState());
     AddUser(kTestUsers[i]);
     EXPECT_EQ(i, user_adding_finished());
@@ skipping 108 matching lines @@
       content::NotificationService::AllSources()).Wait();
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   CheckScreenIsVisible();
   UserAddingScreen::Get()->Cancel();
   content::RunAllPendingInMessageLoop();
 }
 
 }  // namespace chromeos