Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/gtk/location_bar_view_gtk.h

Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index 5881a4115fb8519a203c4ace11b02df96c0bd566..21b4af0912c5af92ac41734ccea05cd860956977 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -31,7 +31,6 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
@@ -46,13 +45,16 @@ class ContentSettingBubbleGtk;
 class ExtensionAction;
 class GtkThemeService;
 class OmniboxViewGtk;
-class SkBitmap;
 class ToolbarModel;
 
 namespace content {
 class WebContents;
 }
 
+namespace gfx {
+class Image;
+}
+
 namespace ui {
 class AcceleratorGtk;
 }
@@ -127,7 +129,7 @@ class LocationBarViewGtk : public OmniboxEditController,
   virtual void OnKillFocus() OVERRIDE;
   virtual void OnSetFocus() OVERRIDE;
   virtual void OnInputInProgress(bool in_progress) OVERRIDE;
-  virtual SkBitmap GetFavicon() const OVERRIDE;
+  virtual gfx::Image GetFavicon() const OVERRIDE;
   virtual string16 GetTitle() const OVERRIDE;
   virtual InstantController* GetInstant() OVERRIDE;
   virtual TabContents* GetTabContents() const OVERRIDE;