In icon_loader_win.cc, if CreateSkBitmapFromHICON fails, don't pass NULL to gfx::Image and crash.

chrome/browser/icon_loader_win.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 <windows.h>
 #include <shellapi.h>
 
 #include "base/bind.h"
@@ skipping 12 matching lines @@
       break;
     case IconLoader::NORMAL:
       size = 0;
       break;
     case IconLoader::LARGE:
       size = SHGFI_LARGEICON;
       break;
     default:
       NOTREACHED();
   }
+
+  image_.reset();
+
   SHFILEINFO file_info = { 0 };
-  if (!SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,
+  if (SHGetFileInfo(group_.c_str(), FILE_ATTRIBUTE_NORMAL, &file_info,
                      sizeof(SHFILEINFO),
-                     SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES))
-    return;
+                     SHGFI_ICON | size | SHGFI_USEFILEATTRIBUTES)) {
+    scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(
+        file_info.hIcon));
+    if (bitmap.get()) {
+      gfx::ImageSkia image_skia(*bitmap);
+      image_skia.MakeThreadSafe();
+      image_.reset(new gfx::Image(image_skia));
+      DestroyIcon(file_info.hIcon);
+    }
+  }
 
-  scoped_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(
-      file_info.hIcon));
-  gfx::ImageSkia image_skia(*bitmap);
-  image_skia.MakeThreadSafe();
-  image_.reset(new gfx::Image(image_skia));
-  DestroyIcon(file_info.hIcon);
+  // Always notify the delegate, regardless of success.
   target_message_loop_->PostTask(FROM_HERE,
       base::Bind(&IconLoader::NotifyDelegate, this));
 }