[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/login/supervised/supervised_user_login_flow.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 "chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
+#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 "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/login/auth/key.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 SupervisedUserLoginFlow::SupervisedUserLoginFlow(
     const std::string& user_id)
     : ExtendedUserFlow(user_id),
       data_loaded_(false),
@@ skipping 30 matching lines @@
     const std::string& token) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ConfigureSync(token);
 }
 
 void SupervisedUserLoginFlow::ConfigureSync(const std::string& token) {
   data_loaded_ = true;
 
   // TODO(antrim): add error handling (no token loaded).
   // See also: http://crbug.com/312751
-  UserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
+  ChromeUserManager::Get()->GetSupervisedUserManager()->ConfigureSyncWithToken(
       profile_, token);
   SupervisedUserAuthentication* auth =
-      UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
 
   if (auth->HasScheduledPasswordUpdate(user_id())) {
     auth->LoadPasswordUpdateData(
         user_id(),
         base::Bind(&SupervisedUserLoginFlow::OnPasswordChangeDataLoaded,
                    weak_factory_.GetWeakPtr()),
         base::Bind(&SupervisedUserLoginFlow::OnPasswordChangeDataLoadFailed,
                    weak_factory_.GetWeakPtr()));
     return;
   }
   Finish();
 }
 
 void SupervisedUserLoginFlow::HandleLoginSuccess(
     const UserContext& login_context) {
   context_ = login_context;
 }
 
 void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(
     const base::DictionaryValue* password_data) {
   // Edge case, when manager has signed in and already updated the password.
   SupervisedUserAuthentication* auth =
-      UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   if (!auth->NeedPasswordChange(user_id(), password_data)) {
     VLOG(1) << "Password already changed for " << user_id();
     auth->ClearScheduledPasswordUpdate(user_id());
     Finish();
     return;
   }
 
   // Two cases now - we can currently have either old-style password, or new
   // password.
   std::string base64_signature;
@@ skipping 63 matching lines @@
                    Passed(&data_copy)));
   } else {
     NOTREACHED() << "Unsupported password schema";
   }
 }
 
 void SupervisedUserLoginFlow::OnNewKeyAdded(
     scoped_ptr<base::DictionaryValue> password_data) {
   VLOG(1) << "New key added";
   SupervisedUserAuthentication* auth =
-      UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
   auth->StorePasswordData(user_id(), *password_data.get());
   auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
   authenticator_->RemoveKey(
       context_,
       kLegacyCryptohomeSupervisedUserKeyLabel,
       base::Bind(&SupervisedUserLoginFlow::OnOldKeyRemoved,
                  weak_factory_.GetWeakPtr()));
 }
 
 void SupervisedUserLoginFlow::OnOldKeyRemoved() {
@@ skipping 24 matching lines @@
           PASSWORD_CHANGE_FAILED_AUTHENTICATION_FAILURE,
       SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
   Finish();
 }
 
 void SupervisedUserLoginFlow::OnPasswordUpdated(
     scoped_ptr<base::DictionaryValue> password_data) {
   VLOG(1) << "Updated password for supervised user";
 
   SupervisedUserAuthentication* auth =
-      UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
 
   // Incomplete state is not there in password_data, carry it from old state.
   bool was_incomplete = auth->HasIncompleteKey(user_id());
   auth->StorePasswordData(user_id(), *password_data.get());
   if (was_incomplete)
     auth->MarkKeyIncomplete(user_id(), true /* incomplete */);
 
   UMA_HISTOGRAM_ENUMERATION(
       "ManagedUsers.ChromeOS.PasswordChange",
       SupervisedUserAuthentication::PASSWORD_CHANGED_IN_USER_SESSION,
       SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
   Finish();
 }
 
 void SupervisedUserLoginFlow::Finish() {
   LoginUtils::Get()->DoBrowserLaunch(profile_, host());
   profile_ = NULL;
   UnregisterFlowSoon();
 }
 
 void SupervisedUserLoginFlow::LaunchExtraSteps(
     Profile* profile) {
   profile_ = profile;
-  UserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
+  ChromeUserManager::Get()->GetSupervisedUserManager()->LoadSupervisedUserToken(
       profile,
-      base::Bind(
-           &SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
-           weak_factory_.GetWeakPtr()));
+      base::Bind(&SupervisedUserLoginFlow::OnSyncSetupDataLoaded,
+                 weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace chromeos