Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / desktop_background / wallpaper_resizer_unittest.cc

diff --git a/src/ash/desktop_background/wallpaper_resizer_unittest.cc b/src/ash/desktop_background/wallpaper_resizer_unittest.cc
index 12adaf3..6a06490 100644 (file)
--- a/src/ash/desktop_background/wallpaper_resizer_unittest.cc
+++ b/src/ash/desktop_background/wallpaper_resizer_unittest.cc
@@ -27,8 +27,7 @@ gfx::ImageSkia CreateTestImage(const gfx::Size& size) {
   SkBitmap src;
   int w = size.width();
   int h = size.height();
-  src.setConfig(SkBitmap::kARGB_8888_Config, w, h);
-  src.allocPixels();
+  src.allocN32Pixels(w, h);
 
   // Fill bitmap with data.
   for (int y = 0; y < h; ++y) {
@@ -55,7 +54,6 @@ bool IsColor(const gfx::ImageSkia& image, const uint32_t expect) {
 }  // namespace
 
 namespace ash {
-namespace internal {
 
 class WallpaperResizerTest : public testing::Test,
                              public WallpaperResizerObserver {
@@ -63,7 +61,7 @@ class WallpaperResizerTest : public testing::Test,
   WallpaperResizerTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_) {
   }
-  virtual ~WallpaperResizerTest() {}
+  ~WallpaperResizerTest() override {}
 
   gfx::ImageSkia Resize(const gfx::ImageSkia& image,
                         const gfx::Size& target_size,
@@ -81,9 +79,7 @@ class WallpaperResizerTest : public testing::Test,
     message_loop_.Run();
   }
 
-  virtual void OnWallpaperResized() OVERRIDE {
-    message_loop_.Quit();
-  }
+  void OnWallpaperResized() override { message_loop_.Quit(); }
 
  private:
   base::MessageLoop message_loop_;
@@ -156,5 +152,4 @@ TEST_F(WallpaperResizerTest, ImageId) {
   EXPECT_EQ(WallpaperResizer::GetImageId(image), resizer.original_image_id());
 }
 
-}  // namespace internal
 }  // namespace ash