Fix wrong CENTER_CROPPED resize in wallpaper_resizer and add some unittests

BUG=244629

Review URL: https://chromiumcodereview.appspot.com/15979025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204598 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/ash/desktop_background/wallpaper_resizer.h b/ash/desktop_background/wallpaper_resizer.h
index eb7e1d5..9b47b7c 100644
--- a/ash/desktop_background/wallpaper_resizer.h
+++ b/ash/desktop_background/wallpaper_resizer.h
@@ -11,17 +11,19 @@
 #include "base/observer_list.h"
 #include "skia/ext/image_operations.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/size.h"
 
 namespace ash {
 
 class WallpaperResizerObserver;
 
-// Stores the current wallpaper data and resize it to fit all screens if needed.
+// Stores the current wallpaper data and resize it to |target_size| if needed.
 class ASH_EXPORT WallpaperResizer {
  public:
-  explicit WallpaperResizer(const WallpaperInfo& info);
+  WallpaperResizer(const WallpaperInfo& info, const gfx::Size& target_size);
 
-  WallpaperResizer(const WallpaperInfo& info, const gfx::ImageSkia& image);
+  WallpaperResizer(const WallpaperInfo& info, const gfx::Size& target_size,
+                   const gfx::ImageSkia& image);
 
   virtual ~WallpaperResizer();
 
@@ -44,6 +46,8 @@ class ASH_EXPORT WallpaperResizer {
 
   const WallpaperInfo wallpaper_info_;
 
+  gfx::Size target_size_;
+
   gfx::ImageSkia wallpaper_image_;
 
   base::WeakPtrFactory<WallpaperResizer> weak_ptr_factory_;