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

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 f70cd25e1d5ee2ec835bfe91e4a3ae34fd4c4f8d..1d536e92b01549e32dc98830693a978d2a319960 100644
--- a/chrome/browser/ui/panels/panel_host.cc
+++ b/chrome/browser/ui/panels/panel_host.cc
@@ -26,7 +26,7 @@
 #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"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 using content::UserMetricsAction;
@@ -63,10 +63,9 @@ void PanelHost::DestroyWebContents() {
   favicon_tab_helper_.reset();
 }
 
-SkBitmap PanelHost::GetPageIcon() const {
-  // TODO: Make this function return gfx::Image.
+gfx::Image PanelHost::GetPageIcon() const {
   return favicon_tab_helper_.get() ?
-      favicon_tab_helper_->GetFavicon().AsBitmap() : SkBitmap();
+      favicon_tab_helper_->GetFavicon() : gfx::Image();
 }
 
 void PanelHost::NavigationStateChanged(const content::WebContents* source,