Move UserImage to user_manager

chrome/browser/chromeos/login/users/avatar/user_image_loader.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_loader.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/users/avatar/user_image.h"
+#include "components/user_manager/user_image/user_image.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace chromeos {
 
 UserImageLoader::ImageInfo::ImageInfo(const std::string& file_path,
                                       int pixels_per_side,
                                       const LoadedCallback& loaded_cb)
@@ skipping 93 matching lines @@
     } else {
       final_image = cropped_image;
     }
   }
   // Make the SkBitmap immutable as we won't modify it. This is important
   // because otherwise it gets duplicated during painting, wasting memory.
   final_image.setImmutable();
   gfx::ImageSkia final_image_skia =
       gfx::ImageSkia::CreateFrom1xBitmap(final_image);
   final_image_skia.MakeThreadSafe();
-  UserImage user_image(final_image_skia, decoder->get_image_data());
+  user_manager::UserImage user_image(final_image_skia,
+                                     decoder->get_image_data());
   user_image.set_file_path(file_path);
   if (image_codec_ == ImageDecoder::ROBUST_JPEG_CODEC)
     user_image.MarkAsSafe();
   foreground_task_runner_->PostTask(FROM_HERE,
                                     base::Bind(loaded_cb, user_image));
 }
 
 void UserImageLoader::OnDecodeImageFailed(const ImageDecoder* decoder) {
   DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
 
   ImageInfoMap::iterator it = image_info_map_.find(decoder);
   if (it == image_info_map_.end()) {
     NOTREACHED();
     return;
   }
   const LoadedCallback loaded_cb = it->second.loaded_cb;
   image_info_map_.erase(it);
 
-  foreground_task_runner_->PostTask(FROM_HERE,
-                                    base::Bind(loaded_cb, UserImage()));
+  foreground_task_runner_->PostTask(
+      FROM_HERE, base::Bind(loaded_cb, user_manager::UserImage()));
 }
 
 }  // namespace chromeos