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

chrome/browser/ui/panels/panel_host.cc

Index: chrome/browser/ui/panels/panel_host.cc
diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc
index 9162967105b747a85534a3077b9a3292764428f3..11cd3ef74b1a0582a66ad0fad7ebc3afffa497f6 100644
--- a/chrome/browser/ui/panels/panel_host.cc
+++ b/chrome/browser/ui/panels/panel_host.cc
@@ -22,6 +22,7 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/gfx/image/image.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -62,8 +63,9 @@ void PanelHost::DestroyWebContents() {
 }
 
 SkBitmap PanelHost::GetPageIcon() const {
+  // TODO: Make this function return gfx::Image.
   return favicon_tab_helper_.get() ?
-      favicon_tab_helper_->GetFavicon() : SkBitmap();
+      favicon_tab_helper_->GetFavicon().AsBitmap() : SkBitmap();
 }
 
 void PanelHost::NavigationStateChanged(const content::WebContents* source,