Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 272c6f6cf2a08777c924d779e2150171c3539293..0273007adebb1a3248ab076bf373dfc038eac54c 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -816,8 +816,8 @@ void LocationBarViewGtk::OnSetFocus() {
   OnChanged();
 }
 
-SkBitmap LocationBarViewGtk::GetFavicon() const {
-  return GetTabContents()->favicon_tab_helper()->GetFavicon().AsBitmap();
+gfx::Image LocationBarViewGtk::GetFavicon() const {
+  return GetTabContents()->favicon_tab_helper()->GetFavicon();
 }
 
 string16 LocationBarViewGtk::GetTitle() const {
@@ -1349,13 +1349,12 @@ void LocationBarViewGtk::OnIconDragData(GtkWidget* sender,
 
 void LocationBarViewGtk::OnIconDragBegin(GtkWidget* sender,
                                          GdkDragContext* context) {
-  SkBitmap favicon = GetFavicon();
-  GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(favicon);
-  if (!pixbuf)
+  gfx::Image favicon = GetFavicon();
+  if (favicon.IsEmpty())
     return;
+  GdkPixbuf* pixbuf = favicon.ToGdkPixbuf();

[Nico, 2012/08/16 21:35:06]

nit: no need for the local variable

   drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf,
       GetTitle(), theme_service_);
-  g_object_unref(pixbuf);
   gtk_drag_set_icon_widget(context, drag_icon_, 0, 0);
 
   WebContents* tab = GetWebContents();