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

chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.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/ui/views/ash/launcher/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 209 matching lines @@
     // Only update the icon if we have a new image, or none has been set yet.
     // This avoids flickering to an empty image when a pinned app is opened.
     if (!new_image.empty())
       item.image = new_image;
     else if (item.image.empty())
       item.image = extensions::Extension::GetDefaultIcon(true);
   } else {
     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);
       }
     } else {
       item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
 }
 
 void BrowserLauncherItemController::UpdateAppState(TabContents* tab) {
   ChromeLauncherController::AppState app_state;
 
   if (tab_model_->GetIndexOfTabContents(tab) == TabStripModel::kNoTab) {
     app_state = ChromeLauncherController::APP_STATE_REMOVED;
   } else if (tab_model_->GetActiveTabContents() == tab) {
     if (ash::wm::IsActiveWindow(window_))
       app_state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
     else
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller_->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller_->model();
 }