| Index: chrome/browser/icon_loader_linux.cc
|
| diff --git a/chrome/browser/icon_loader_linux.cc b/chrome/browser/icon_loader_linux.cc
|
| index b70dfd8d48aab8b8abe239372c30aab4a89733fc..f0bb1e627c1851c5ac1196460cb87485ff779e28 100644
|
| --- a/chrome/browser/icon_loader_linux.cc
|
| +++ b/chrome/browser/icon_loader_linux.cc
|
| @@ -40,14 +40,14 @@ void IconLoader::ReadIcon() {
|
| file_util::ReadFileToString(filename, &icon_data);
|
|
|
| webkit_glue::ImageDecoder decoder;
|
| - scoped_ptr<SkBitmap> bitmap(new SkBitmap());
|
| - *bitmap = decoder.Decode(
|
| + SkBitmap bitmap;
|
| + 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.release()));
|
| + if (!bitmap.empty()) {
|
| + DCHECK_EQ(size_pixels, bitmap.width());
|
| + DCHECK_EQ(size_pixels, bitmap.height());
|
| + image_.reset(new gfx::Image(bitmap));
|
| } else {
|
| LOG(WARNING) << "Unsupported file type or load error: "
|
| << filename.value();
|
|
|