Change panels to use gfx::Image instead of SkBitmap for favicon.

chrome/browser/task_manager/task_manager_resource_providers.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/task_manager/task_manager_resource_providers.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 552 matching lines @@
   base::i18n::AdjustStringForLocaleDirection(&title);
 
   return l10n_util::GetStringFUTF16(message_prefix_id_, title);
 }
 
 string16 TaskManagerPanelResource::GetProfileName() const {
   return GetProfileNameFromInfoCache(panel_->profile());
 }
 
 gfx::ImageSkia TaskManagerPanelResource::GetIcon() const {
-  return panel_->GetCurrentPageIcon();
+  gfx::Image icon = panel_->GetCurrentPageIcon();
+  return icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia();
 }
 
 WebContents* TaskManagerPanelResource::GetWebContents() const {
   return panel_->GetWebContents();
 }
 
 const Extension* TaskManagerPanelResource::GetExtension() const {
   ExtensionService* extension_service =
       panel_->profile()->GetExtensionService();
   return extension_service->extensions()->GetByID(panel_->extension_id());
@@ skipping 1107 matching lines @@
 
   return &resource_;
 }
 
 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
   task_manager_->AddResource(&resource_);
 }
 
 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
 }