Change return type of FaviconTabHelper::GetFavicon() to gfx::Image.

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

Index: chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
diff --git a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
index 3dde3c82e768e20abb108e4327ce7c20dd289075..24f1eea6a62eb58c7905dbcc4c16f452b1a4fede 100644
--- a/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
+++ b/chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.cc
@@ -227,7 +227,7 @@ void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {
     DCHECK_EQ(TYPE_TABBED, type_);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
-      item.image = tab->favicon_tab_helper()->GetFavicon();
+      item.image = tab->favicon_tab_helper()->GetFavicon().AsBitmap();
       if (item.image.empty()) {
         item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
       }