Index: chrome/browser/task_manager/task_manager_resource_providers.cc |
diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc |
index a791bc5a159bc7665461b6a703fe831887f80345..d6014581f41ff76cb596baf22484b622e18cae96 100644 |
--- a/chrome/browser/task_manager/task_manager_resource_providers.cc |
+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc |
@@ -334,7 +334,8 @@ string16 TaskManagerTabContentsResource::GetProfileName() const { |
gfx::ImageSkia TaskManagerTabContentsResource::GetIcon() const { |
if (IsPrerendering()) |
return *prerender_icon_; |
- return tab_contents_->favicon_tab_helper()->GetFavicon().AsImageSkia(); |
+ const gfx::Image& icon = tab_contents_->favicon_tab_helper()->GetFavicon(); |
+ return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia(); |
} |
WebContents* TaskManagerTabContentsResource::GetWebContents() const { |