[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/profiles/profile_helper.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 namespace {
 
 bool ShouldAddProfileDirPrefix(const std::string& user_id_hash) {
   // Do not add profile dir prefix for legacy profile dir and test
   // user profile. The reason of not adding prefix for test user profile
   // is to keep the promise that TestingProfile::kTestUserProfileDir and
@@ skipping 24 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ProfileHelper, public
 
 ProfileHelper::ProfileHelper()
     : signin_profile_clear_requested_(false) {
 }
 
 ProfileHelper::~ProfileHelper() {
   // Checking whether UserManager is initialized covers case
   // when ScopedTestUserManager is used.
-  if (UserManager::IsInitialized())
-    UserManager::Get()->RemoveSessionStateObserver(this);
+  if (user_manager::UserManager::IsInitialized())
+    user_manager::UserManager::Get()->RemoveSessionStateObserver(this);
 }
 
 // static
 ProfileHelper* ProfileHelper::Get() {
   return g_browser_process->platform_part()->profile_helper();
 }
 
 // static
 Profile* ProfileHelper::GetProfileByUserIdHash(
     const std::string& user_id_hash) {
@@ skipping 68 matching lines @@
              : base::FilePath(user_id_hash);
 }
 
 // static
 base::FilePath ProfileHelper::GetUserProfileDirByUserId(
     const std::string& user_id) {
   // TODO(dpolukhin): Remove Chrome OS specific profile path logic from
   // ProfileManager and use only this function to construct profile path.
   // TODO(nkostylev): Cleanup profile dir related code paths crbug.com/294233
   base::FilePath profile_dir;
-  const user_manager::User* user = UserManager::Get()->FindUser(user_id);
+  const user_manager::User* user =
+      user_manager::UserManager::Get()->FindUser(user_id);
   if (user && !user->username_hash().empty())
     profile_dir = ProfileHelper::GetUserProfileDir(user->username_hash());
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   profile_dir = profile_manager->user_data_dir().Append(profile_dir);
 
   return profile_dir;
 }
 
 // static
 bool ProfileHelper::IsSigninProfile(Profile* profile) {
   return profile->GetPath().BaseName().value() == chrome::kInitialProfile;
 }
 
 // static
 bool ProfileHelper::IsOwnerProfile(Profile* profile) {
   if (!profile)
     return false;
   user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return false;
 
-  return user->email() == chromeos::UserManager::Get()->GetOwnerEmail();
+  return user->email() == user_manager::UserManager::Get()->GetOwnerEmail();
 }
 
-//static
+// static
 bool ProfileHelper::IsPrimaryProfile(Profile* profile) {
   if (!profile)
     return false;
   user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return false;
-  return user == chromeos::UserManager::Get()->GetPrimaryUser();
+  return user == user_manager::UserManager::Get()->GetPrimaryUser();
 }
 
 void ProfileHelper::ProfileStartup(Profile* profile, bool process_startup) {
   // Initialize Chrome OS preferences like touch pad sensitivity. For the
   // preferences to work in the guest mode, the initialization has to be
   // done after |profile| is switched to the incognito profile (which
   // is actually GuestSessionProfile in the guest mode). See the
   // GetOffTheRecordProfile() call above.
   profile->InitChromeOSPreferences();
 
   // Add observer so we can see when the first profile's session restore is
   // completed. After that, we won't need the default profile anymore.
   if (!IsSigninProfile(profile) &&
-      UserManager::Get()->IsLoggedInAsRegularUser() &&
-      !UserManager::Get()->IsLoggedInAsStub()) {
+      user_manager::UserManager::Get()->IsLoggedInAsRegularUser() &&
+      !user_manager::UserManager::Get()->IsLoggedInAsStub()) {
     chromeos::OAuth2LoginManager* login_manager =
         chromeos::OAuth2LoginManagerFactory::GetInstance()->GetForProfile(
             profile);
     if (login_manager)
       login_manager->AddObserver(this);
   }
 }
 
 base::FilePath ProfileHelper::GetActiveUserProfileDir() {
   return ProfileHelper::GetUserProfileDir(active_user_id_hash_);
 }
 
 void ProfileHelper::Initialize() {
-  UserManager::Get()->AddSessionStateObserver(this);
+  user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 void ProfileHelper::ClearSigninProfile(const base::Closure& on_clear_callback) {
   on_clear_callbacks_.push_back(on_clear_callback);
   if (signin_profile_clear_requested_)
     return;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // Check if signin profile was loaded.
   if (!profile_manager->GetProfileByPath(GetSigninProfileDir())) {
     OnBrowsingDataRemoverDone();
@@ skipping 16 matching lines @@
   }
 
   Profile* profile = NULL;
   if (user->is_profile_created())
     profile = ProfileHelper::GetProfileByUserIdHash(user->username_hash());
   else
     profile = ProfileManager::GetActiveUserProfile();
 
   // GetActiveUserProfile() or GetProfileByUserIdHash() returns a new instance
   // of ProfileImpl(), but actually its OffTheRecordProfile() should be used.
-  if (profile && UserManager::Get()->IsLoggedInAsGuest())
+  if (profile && user_manager::UserManager::Get()->IsLoggedInAsGuest())
     profile = profile->GetOffTheRecordProfile();
   return profile;
 }
 
 user_manager::User* ProfileHelper::GetUserByProfile(Profile* profile) {
   // This map is non-empty only in tests.
   if (enable_profile_to_user_testing || !user_list_for_testing_.empty()) {
     if (always_return_primary_user_for_testing)
       return const_cast<user_manager::User*>(
-          UserManager::Get()->GetPrimaryUser());
+          user_manager::UserManager::Get()->GetPrimaryUser());
 
     const std::string& user_name = profile->GetProfileName();
     for (user_manager::UserList::const_iterator it =
              user_list_for_testing_.begin();
          it != user_list_for_testing_.end();
          ++it) {
       if ((*it)->email() == user_name)
         return *it;
     }
 
     // In case of test setup we should always default to primary user.
     return const_cast<user_manager::User*>(
-        UserManager::Get()->GetPrimaryUser());
+        user_manager::UserManager::Get()->GetPrimaryUser());
   }
 
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (ProfileHelper::IsSigninProfile(profile))
     return NULL;
 
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Special case for non-CrOS tests that do create several profiles
   // and don't really care about mapping to the real user.
   // Without multi-profiles on Chrome OS such tests always got active_user_.
   // Now these tests will specify special flag to continue working.
   // In future those tests can get a proper CrOS configuration i.e. register
   // and login several users if they want to work with an additional profile.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kIgnoreUserProfileMappingForTests)) {
     return user_manager->GetActiveUser();
@@ skipping 71 matching lines @@
   ProfileHelper::SetProfileToUserForTestingEnabled(true);
 }
 
 void ProfileHelper::SetUserToProfileMappingForTesting(
     const user_manager::User* user,
     Profile* profile) {
   user_to_profile_for_testing_[user] = profile;
 }
 
 }  // namespace chromeos