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) 2011 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/message_loop.h"
@@ skipping 24 matching lines @@
 
   ICONINFO icon_info = { 0 };
   BITMAP bitmap_info = { 0 };
 
   BOOL r = ::GetIconInfo(file_info.hIcon, &icon_info);
   DCHECK(r);
   r = ::GetObject(icon_info.hbmMask, sizeof(bitmap_info), &bitmap_info);
   DCHECK(r);
 
   gfx::Size icon_size(bitmap_info.bmWidth, bitmap_info.bmHeight);
-  image_.reset(new gfx::Image(
-      IconUtil::CreateSkBitmapFromHICON(file_info.hIcon, icon_size)));
 
+  const SkBitmap* bitmap =
+      IconUtil::CreateSkBitmapFromHICON(file_info.hIcon, icon_size);
+  if (!bitmap) {
+    LOG(ERROR) << "Decoding HICON for group " << group_ << " failed";
+    // Don't create a gfx::Image and crash. The delegate won't be notified.

[Peter Kasting, 2011/08/26 18:12:56]

Should we instead set |image_| to a non-NULL but zero-size or blank image and
notify the delegate anyway?  Arguably that's more consistent behavior.

[Robert Sesek, 2011/08/26 19:38:28]

No, we should actually notify with a NULL pointer, as described in the header.
Changed to do just that.

+    return;
+  }
+
+  image_.reset(new gfx::Image(bitmap));
   target_message_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(this, &IconLoader::NotifyDelegate));
 }