Revert 137075 - Get rid of Image::Image(SkBitmap*)

ui/gfx/image/image_unittest_util.cc

 // Copyright (c) 2011 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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace gfx {
 namespace test {
 
-const SkBitmap CreateBitmap(int width, int height) {
-  SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
-  bitmap.allocPixels();
-  bitmap.eraseRGB(255, 0, 0);
+SkBitmap* CreateBitmap(int width, int height) {
+  SkBitmap* bitmap = new SkBitmap();
+  bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height);
+  bitmap->allocPixels();
+  bitmap->eraseRGB(255, 0, 0);
   return bitmap;
 }
 
 gfx::Image CreateImage() {
   return gfx::Image(CreateBitmap(100, 50));
 }
 
 bool IsEqual(const gfx::Image& image1, const gfx::Image& image2) {
   const SkBitmap& bmp1 = *image1.ToSkBitmap();
   const SkBitmap& bmp2 = *image2.ToSkBitmap();
@@ skipping 20 matching lines @@
   return true;
 }
 
 bool IsEmpty(const gfx::Image& image) {
   const SkBitmap& bmp = *image.ToSkBitmap();
   return bmp.isNull() ||
          (bmp.width() == 0 && bmp.height() == 0);
 }
 
 PlatformImage CreatePlatformImage() {
-  const SkBitmap bitmap(CreateBitmap(25, 25));
+  scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25));
 #if defined(OS_MACOSX)
-  NSImage* image = gfx::SkBitmapToNSImage(bitmap);
+  NSImage* image = gfx::SkBitmapToNSImage(*(bitmap.get()));
   base::mac::NSObjectRetain(image);
   return image;
 #elif defined(TOOLKIT_GTK)
-  return gfx::GdkPixbufFromSkBitmap(&bitmap);
+  return gfx::GdkPixbufFromSkBitmap(bitmap.get());
 #else
-  return bitmap;
+  return bitmap.release();
 #endif
 }
 
 gfx::Image::RepresentationType GetPlatformRepresentationType() {
 #if defined(OS_MACOSX)
   return gfx::Image::kImageRepCocoa;
 #elif defined(TOOLKIT_GTK)
   return gfx::Image::kImageRepGdk;
 #else
   return gfx::Image::kImageRepSkia;
 #endif
 }
 
 PlatformImage ToPlatformType(const gfx::Image& image) {
 #if defined(OS_MACOSX)
   return image.ToNSImage();
 #elif defined(TOOLKIT_GTK)
   return image.ToGdkPixbuf();
 #else
-  return *image.ToSkBitmap();
-#endif
-}
-
-bool IsPlatformImageValid(PlatformImage image) {
-#if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
-  return image != NULL;
-#else
-  return !image.isNull();
-#endif
-}
-
-bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
-#if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
-  return image1 == image2;
-#else
-  return image1.getPixels() == image2.getPixels();
+  return image.ToSkBitmap();
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx