[cros] Move User class to user_manager component.

chrome/browser/supervised_user/chromeos/manager_password_service.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/supervised_user/chromeos/manager_password_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.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/users/supervised_user_manager.h"
-#include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
+#include "components/user_manager/user.h"
 #include "components/user_manager/user_type.h"
 
 namespace chromeos {
 
 ManagerPasswordService::ManagerPasswordService() : weak_ptr_factory_(this) {}
 
 ManagerPasswordService::~ManagerPasswordService() {}
 
 void ManagerPasswordService::Init(
     const std::string& user_id,
     SupervisedUserSyncService* user_service,
     SupervisedUserSharedSettingsService* shared_settings_service) {
   user_id_ = user_id;
   user_service_ = user_service;
   settings_service_ = shared_settings_service;
   settings_service_subscription_ = settings_service_->Subscribe(
       base::Bind(&ManagerPasswordService::OnSharedSettingsChange,
                  weak_ptr_factory_.GetWeakPtr()));
 
   authenticator_ = new ExtendedAuthenticator(this);
 
   UserManager* user_manager = UserManager::Get();
 
   SupervisedUserManager* supervised_user_manager =
       user_manager->GetSupervisedUserManager();
 
-  const UserList& users = user_manager->GetUsers();
+  const user_manager::UserList& users = user_manager->GetUsers();
 
-  for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
+  for (user_manager::UserList::const_iterator it = users.begin();
+       it != users.end();
+       ++it) {
     if ((*it)->GetType() != user_manager::USER_TYPE_SUPERVISED)
       continue;
     if (user_id != supervised_user_manager->GetManagerUserId((*it)->email()))
       continue;
     OnSharedSettingsChange(
         supervised_user_manager->GetUserSyncId((*it)->email()),
         supervised_users::kChromeOSPasswordData);
   }
 }
 
 void ManagerPasswordService::OnSharedSettingsChange(
     const std::string& su_id,
     const std::string& key) {
   if (key != supervised_users::kChromeOSPasswordData)
     return;
 
   SupervisedUserManager* supervised_user_manager =
       UserManager::Get()->GetSupervisedUserManager();
-  const User* user = supervised_user_manager->FindBySyncId(su_id);
+  const user_manager::User* user = supervised_user_manager->FindBySyncId(su_id);
   // No user on device.
   if (user == NULL)
     return;
 
   const base::Value* value = settings_service_->GetValue(su_id, key);
 
   if (value == NULL) {
     LOG(WARNING) << "Got empty value from sync.";
     return;
   }
@@ skipping 183 matching lines @@
 void ManagerPasswordService::OnOldManagerKeyDeleted(
     const UserContext& master_key_context) {
   VLOG(1) << "Removed old master key for " << master_key_context.GetUserID();
 }
 
 void ManagerPasswordService::Shutdown() {
   settings_service_subscription_.reset();
 }
 
 }  // namespace chromeos