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

chrome/browser/icon_loader_linux.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 <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 22 matching lines @@
   }
 
   FilePath filename = base::nix::GetMimeIcon(group_, size_pixels);
   // We don't support SVG icons; this just spams the terminal so fail quickly
   // and don't try to read the file from disk first.
   if (filename.Extension() != ".svg") {
     string icon_data;
     file_util::ReadFileToString(filename, &icon_data);
 
     webkit_glue::ImageDecoder decoder;
-    SkBitmap bitmap;
-    bitmap = decoder.Decode(
+    scoped_ptr<SkBitmap> bitmap(new SkBitmap());
+    *bitmap = decoder.Decode(
         reinterpret_cast<const unsigned char*>(icon_data.data()),
         icon_data.length());
-    if (!bitmap.empty()) {
-      DCHECK_EQ(size_pixels, bitmap.width());
-      DCHECK_EQ(size_pixels, bitmap.height());
-      image_.reset(new gfx::Image(bitmap));
+    if (!bitmap->empty()) {
+      DCHECK_EQ(size_pixels, bitmap->width());
+      DCHECK_EQ(size_pixels, bitmap->height());
+      image_.reset(new gfx::Image(bitmap.release()));
     } else {
       LOG(WARNING) << "Unsupported file type or load error: "
                    << filename.value();
     }
   }
 
   target_message_loop_->PostTask(
       FROM_HERE, base::Bind(&IconLoader::NotifyDelegate, this));
 }