[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 1d4e0934ccd483bd059cb7b52751b298f711c998..d05bc08615213568a0b1891e9f45cde84257cb91 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "google_apis/gaia/gaia_auth_util.h"
@@ -56,7 +56,7 @@ void UpdateAuthParams(base::DictionaryValue* params,
   // 3. New users are allowed by owner.
   // 4. Supervised users are allowed by owner.
   bool supervised_users_allowed =
-      UserManager::Get()->AreSupervisedUsersAllowed();
+      user_manager::UserManager::Get()->AreSupervisedUsersAllowed();
   bool supervised_users_can_create = true;
   int message_id = -1;
   if (!has_users) {
@@ -303,7 +303,8 @@ void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email,
   }
 
   // Consumer management enrollment is in progress.
-  const std::string owner_email = UserManager::Get()->GetOwnerEmail();
+  const std::string owner_email =
+      user_manager::UserManager::Get()->GetOwnerEmail();
   if (typed_email != owner_email) {
     // Show Gaia sign-in screen again, since we only allow the owner to sign
     // in.