crbug.com/124865 - DCHECK failure when pinning Chrome Web Store to Launcher

chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc

Index: chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
index 4f6060d58c058e2f500dde72acca8e5201bb1354..a0a512de096c14ea6b5d82cc8be895c3ebfb91c0 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.cc
@@ -45,13 +45,16 @@ void LauncherAppIconLoader::FetchImage(const std::string& id) {
   if (!image_loader_.get())
     image_loader_.reset(new ImageLoadingTracker(this));
   map_[image_loader_->next_id()] = id;
+  ExtensionResource extension_resource =
+      extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,

[Aaron Boodman, 2012/08/08 21:42:01]

You can undo these changes now, right?

[sschmitz, 2012/08/08 22:04:30]

Done.

+                                 ExtensionIconSet::MATCH_BIGGER);
   image_loader_->LoadImage(
       extension,
-      extension->GetIconResource(ExtensionIconSet::EXTENSION_ICON_SMALL,
-                                 ExtensionIconSet::MATCH_BIGGER),
+      extension_resource,
       gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
                 ExtensionIconSet::EXTENSION_ICON_SMALL),
-      ImageLoadingTracker::CACHE);
+      extension_resource.empty() ? ImageLoadingTracker::DONT_CACHE :
+                                   ImageLoadingTracker::CACHE);
 }
 
 void LauncherAppIconLoader::OnImageLoaded(const gfx::Image& image,