[cros] user_manager component - move UserManagerBase and UserManager

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

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 b8bd601bbc8e4e47d26f5ccace825f02d7e7632a..219dfb68a3d860bcf170bbb97f673551beabfd43 100644
--- a/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -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, user_manager::UserManager::Get()->GetUsers().size());
+  EXPECT_EQ(0u, user_manager::UserManager::Get()->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, user_manager::UserManager::Get()->GetLoggedInUsers().size());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
@@ -120,8 +120,9 @@ 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, user_manager::UserManager::Get()->GetLoggedInUsers().size());
+  EXPECT_EQ(kTestUsers[0],
+            user_manager::UserManager::Get()->GetActiveUser()->email());
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
@@ -141,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
             ash::Shell::GetInstance()->session_state_delegate()->
                 GetSessionState());
 
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   for (int i = 1; i < 3; ++i) {
     UserAddingScreen::Get()->Start();