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

ui/gfx/image/image_unittest_util.cc

Index: ui/gfx/image/image_unittest_util.cc
===================================================================
--- ui/gfx/image/image_unittest_util.cc	(revision 137075)
+++ ui/gfx/image/image_unittest_util.cc	(working copy)
@@ -20,11 +20,11 @@
 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;
 }
 
@@ -65,15 +65,15 @@
 }
 
 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
 }
 
@@ -93,25 +93,9 @@
 #elif defined(TOOLKIT_GTK)
   return image.ToGdkPixbuf();
 #else
-  return *image.ToSkBitmap();
+  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();
-#endif
-}
-
 }  // namespace test
 }  // namespace gfx