Get rid of Image::Image(SkBitmap*)

chrome/browser/icon_loader_chromeos.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/icon_loader.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
@@ skipping 146 matching lines @@
     case IconLoader::ALL:
     default:
       NOTREACHED();
   }
   return idr;
 }
 
 // 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(SkBitmap* source, int pixel_size) {
-  DCHECK(source);
-  DCHECK(source->width() == source->height());
+SkBitmap GenerateBitmapWithSize(const SkBitmap& source, int pixel_size) {
+  DCHECK(!source.isNull());
+  DCHECK(source.width() == source.height());
 
-  if (pixel_size == kDoNotResize || source->width() == pixel_size)
-    return new SkBitmap(*source);
+  if (pixel_size == kDoNotResize || source.width() == pixel_size)
+    return source;
 
-  return new SkBitmap(skia::ImageOperations::Resize(
-      *source, skia::ImageOperations::RESIZE_BEST, pixel_size, pixel_size));
+  return skia::ImageOperations::Resize(
+      source, skia::ImageOperations::RESIZE_BEST, pixel_size, pixel_size);
 }
 
 int IconSizeToPixelSize(IconLoader::IconSize size) {
   switch (size) {
     case IconLoader::SMALL:  return 16;
     case IconLoader::NORMAL: return 32;
     case IconLoader::LARGE:  // fallthrough
       // On ChromeOS, we consider LARGE to mean "the largest image we have."
       // Since we have already chosen the largest applicable image resource, we
       // return the image as-is.
@@ skipping 10 matching lines @@
       LAZY_INSTANCE_INITIALIZER;
   int idr = icon_mapper.Get().Lookup(group_, icon_size_);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   scoped_refptr<base::RefCountedStaticMemory> bytes(
       rb.LoadDataResourceBytes(idr));
   DCHECK(bytes.get());
   SkBitmap bitmap;
   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));
 }