[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.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/users/avatar/user_image_manager_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/rand_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "policy/policy_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 417 matching lines @@
                               kUserImageProperties);
   update->SetWithoutPathExpansion(user_id(), entry.release());
 
   parent_->user_manager_->NotifyLocalStateChanged();
 }
 
 void UserImageManagerImpl::Job::NotifyJobDone() {
   parent_->OnJobDone();
 }
 
-UserImageManagerImpl::UserImageManagerImpl(const std::string& user_id,
-                                           UserManager* user_manager)
+UserImageManagerImpl::UserImageManagerImpl(
+    const std::string& user_id,
+    user_manager::UserManager* user_manager)
     : UserImageManager(user_id),
       user_manager_(user_manager),
       downloading_profile_image_(false),
       profile_image_requested_(false),
       has_managed_image_(false),
       user_needs_migration_(false),
       weak_factory_(this) {
   base::SequencedWorkerPool* blocking_pool =
       content::BrowserThread::GetBlockingPool();
   background_task_runner_ =
@@ skipping 271 matching lines @@
 
 void UserImageManagerImpl::OnProfileDownloadSuccess(
     ProfileDownloader* downloader) {
   // Ensure that the |profile_downloader_| is deleted when this method returns.
   scoped_ptr<ProfileDownloader> profile_downloader(
       profile_downloader_.release());
   DCHECK_EQ(downloader, profile_downloader.get());
 
   user_manager_->UpdateUserAccountData(
       user_id(),
-      UserManager::UserAccountData(downloader->GetProfileFullName(),
-                                   downloader->GetProfileGivenName(),
-                                   downloader->GetProfileLocale()));
+      user_manager::UserManager::UserAccountData(
+          downloader->GetProfileFullName(),
+          downloader->GetProfileGivenName(),
+          downloader->GetProfileLocale()));
   if (!downloading_profile_image_)
     return;
 
   ProfileDownloadResult result = kDownloadFailure;
   switch (downloader->GetProfilePictureStatus()) {
     case ProfileDownloader::PICTURE_SUCCESS:
       result = kDownloadSuccess;
       break;
     case ProfileDownloader::PICTURE_CACHED:
       result = kDownloadCached;
@@ skipping 240 matching lines @@
 
 bool UserImageManagerImpl::IsUserLoggedInAndRegular() const {
   const user_manager::User* user = GetUser();
   if (!user)
     return false;
   return user->is_logged_in() &&
          user->GetType() == user_manager::USER_TYPE_REGULAR;
 }
 
 }  // namespace chromeos