Some cleanup of WallpaperManager.

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

Index: chrome/browser/chromeos/extensions/wallpaper_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index 5a58f082cee9d0a2775693087ac68306427f43f5..59965f5b47f6a12f5e7d6762749bfabf89ecfd03 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -430,7 +430,6 @@ void WallpaperPrivateSetWallpaperFunction::SaveToFile() {
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WallpaperPrivateSetWallpaperFunction::SetDecodedWallpaper,
                    this, base::Passed(&deep_copy)));
-    chromeos::UserImage wallpaper(wallpaper_);
 
     base::FilePath wallpaper_dir;
     CHECK(PathService::Get(chrome::DIR_CHROMEOS_WALLPAPERS, &wallpaper_dir));
@@ -441,7 +440,7 @@ void WallpaperPrivateSetWallpaperFunction::SaveToFile() {
     // Generates and saves small resolution wallpaper. Uses CENTER_CROPPED to
     // maintain the aspect ratio after resize.
     chromeos::WallpaperManager::Get()->ResizeAndSaveWallpaper(
-        wallpaper,
+        wallpaper_,
         file_path,
         ash::WALLPAPER_LAYOUT_CENTER_CROPPED,
         chromeos::kSmallWallpaperMaxWidth,
@@ -534,9 +533,6 @@ void WallpaperPrivateSetCustomWallpaperFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& wallpaper) {
   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
-  chromeos::UserImage::RawImage raw_image(params->wallpaper.begin(),
-                                          params->wallpaper.end());
-  chromeos::UserImage image(wallpaper, raw_image);
   base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
       chromeos::kThumbnailWallpaperSubDir, user_id_hash_, params->file_name);
 
@@ -557,7 +553,7 @@ void WallpaperPrivateSetCustomWallpaperFunction::OnWallpaperDecoded(
                                         params->file_name,
                                         layout,
                                         chromeos::User::CUSTOMIZED,
-                                        image,
+                                        wallpaper,
                                         update_wallpaper);
   unsafe_wallpaper_decoder_ = NULL;
 
@@ -579,13 +575,12 @@ void WallpaperPrivateSetCustomWallpaperFunction::GenerateThumbnail(
     const base::FilePath& thumbnail_path, scoped_ptr<gfx::ImageSkia> image) {

[Nikita (slow), 2014/04/18 09:28:19]

nit: some methods use |wallpaper| others use |image| for the param name. How
about using just one for consistency.

[Thiemo Nagel, 2014/04/23 17:14:06]

Done.

   DCHECK(BrowserThread::GetBlockingPool()->IsRunningSequenceOnCurrentThread(
       sequence_token_));
-  chromeos::UserImage wallpaper(*image.get());
   if (!base::PathExists(thumbnail_path.DirName()))
     base::CreateDirectory(thumbnail_path.DirName());
 
   scoped_refptr<base::RefCountedBytes> data;
   chromeos::WallpaperManager::Get()->ResizeWallpaper(
-      wallpaper,
+      *image,
       ash::WALLPAPER_LAYOUT_STRETCH,
       chromeos::kWallpaperThumbnailWidth,
       chromeos::kWallpaperThumbnailHeight,