[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/supervised_user/supervised_user_service.cc

Index: chrome/browser/supervised_user/supervised_user_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index a5cae02584aa041052631496eb6c15b6e5630bdd..76f6c8d2534d5dd0fbad3653f2901779db4b73ba 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -47,8 +47,9 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
+#include "components/user_manager/user_manager.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
@@ -236,9 +237,10 @@ void SupervisedUserService::GetCategoryNames(CategoryList* list) {
 
 std::string SupervisedUserService::GetCustodianEmailAddress() const {
 #if defined(OS_CHROMEOS)
-  return chromeos::UserManager::Get()->GetSupervisedUserManager()->
-      GetManagerDisplayEmail(
-          chromeos::UserManager::Get()->GetActiveUser()->email());
+  return chromeos::ChromeUserManager::Get()
+      ->GetSupervisedUserManager()
+      ->GetManagerDisplayEmail(
+          user_manager::UserManager::Get()->GetActiveUser()->email());
 #else
   return profile_->GetPrefs()->GetString(prefs::kSupervisedUserCustodianEmail);
 #endif
@@ -246,9 +248,11 @@ std::string SupervisedUserService::GetCustodianEmailAddress() const {
 
 std::string SupervisedUserService::GetCustodianName() const {
 #if defined(OS_CHROMEOS)
-  return base::UTF16ToUTF8(chromeos::UserManager::Get()->
-      GetSupervisedUserManager()->GetManagerDisplayName(
-          chromeos::UserManager::Get()->GetActiveUser()->email()));
+  return base::UTF16ToUTF8(
+      chromeos::ChromeUserManager::Get()
+          ->GetSupervisedUserManager()
+          ->GetManagerDisplayName(
+              user_manager::UserManager::Get()->GetActiveUser()->email()));
 #else
   std::string name = profile_->GetPrefs()->GetString(
       prefs::kSupervisedUserCustodianName);
@@ -780,9 +784,9 @@ void SupervisedUserService::OnBrowserSetLastActive(Browser* browser) {
 std::string SupervisedUserService::GetSupervisedUserName() const {
 #if defined(OS_CHROMEOS)
   // The active user can be NULL in unit tests.
-  if (chromeos::UserManager::Get()->GetActiveUser()) {
-    return UTF16ToUTF8(chromeos::UserManager::Get()->GetUserDisplayName(
-        chromeos::UserManager::Get()->GetActiveUser()->GetUserID()));
+  if (user_manager::UserManager::Get()->GetActiveUser()) {
+    return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
+        user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else