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

Bug=124566
Test=Compiles on CrOS,Mac

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

TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10383153

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

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/icon_loader_chromeos.cc b/chrome/browser/icon_loader_chromeos.cc
index cc4739f..14692be 100644
--- a/chrome/browser/icon_loader_chromeos.cc
+++ b/chrome/browser/icon_loader_chromeos.cc
@@ -164,15 +164,15 @@ int IconMapper::Lookup(const std::string& extension,
 // Returns a copy of |source| that is |pixel_size| in width and height. If
 // |pixel_size| is |kDoNotResize|, returns an unmodified copy of |source|.
 // |source| must be a square image (width == height).
-SkBitmap GenerateBitmapWithSize(const SkBitmap& source, int pixel_size) {
-  DCHECK(!source.isNull());
-  DCHECK(source.width() == source.height());
+SkBitmap* GenerateBitmapWithSize(SkBitmap* source, int pixel_size) {
+  DCHECK(source);
+  DCHECK(source->width() == source->height());
 
-  if (pixel_size == kDoNotResize || source.width() == pixel_size)
-    return source;
+  if (pixel_size == kDoNotResize || source->width() == pixel_size)
+    return new SkBitmap(*source);
 
-  return skia::ImageOperations::Resize(
-      source, skia::ImageOperations::RESIZE_BEST, pixel_size, pixel_size);
+  return new SkBitmap(skia::ImageOperations::Resize(
+      *source, skia::ImageOperations::RESIZE_BEST, pixel_size, pixel_size));
 }
 
 int IconSizeToPixelSize(IconLoader::IconSize size) {
@@ -203,7 +203,7 @@ void IconLoader::ReadIcon() {
   if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap))
     NOTREACHED();
   image_.reset(new gfx::Image(
-      GenerateBitmapWithSize(bitmap, IconSizeToPixelSize(icon_size_))));
+      GenerateBitmapWithSize(&bitmap, IconSizeToPixelSize(icon_size_))));
   target_message_loop_->PostTask(
       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
 }