Some cleanup of WallpaperManager.

chrome/browser/chromeos/extensions/wallpaper_api.cc

Index: chrome/browser/chromeos/extensions/wallpaper_api.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc
index 1c9e50ab46860f86da51bbd3b80348a2af7d2d62..6d3ee576cda6c029f54e7bf8dd651fcfdb673670 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -122,10 +122,6 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
     const gfx::ImageSkia& wallpaper) {

[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.

   chromeos::WallpaperManager* wallpaper_manager =
       chromeos::WallpaperManager::Get();
-  chromeos::UserImage::RawImage raw_image(
-      params_->details.wallpaper_data->begin(),
-      params_->details.wallpaper_data->end());
-  chromeos::UserImage image(wallpaper, raw_image);
   base::FilePath thumbnail_path = wallpaper_manager->GetCustomWallpaperPath(
       chromeos::kThumbnailWallpaperSubDir,
       user_id_hash_,
@@ -146,7 +142,7 @@ void WallpaperSetWallpaperFunction::OnWallpaperDecoded(
                                         params_->details.name,
                                         layout,
                                         chromeos::User::CUSTOMIZED,
-                                        image,
+                                        wallpaper,
                                         update_wallpaper);
   unsafe_wallpaper_decoder_ = NULL;
 
@@ -168,13 +164,12 @@ void WallpaperSetWallpaperFunction::GenerateThumbnail(
     const base::FilePath& thumbnail_path, scoped_ptr<gfx::ImageSkia> image) {
   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,