Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/omnibox/omnibox_edit_controller.h

Index: chrome/browser/ui/omnibox/omnibox_edit_controller.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_controller.h b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
index fecf3128df6fbd44057b505ee30168bedf4604e3..f6dac47a55ed78aecb7f9f6f5521b89c38bef45d 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
@@ -11,9 +11,12 @@
 
 class GURL;
 class InstantController;
-class SkBitmap;
 class TabContents;
 
+namespace gfx {
+class Image;
+}
+
 // I am in hack-and-slash mode right now.
 // http://code.google.com/p/chromium/issues/detail?id=6772
 
@@ -52,7 +55,7 @@ class OmniboxEditController {
   virtual void OnSetFocus() = 0;
 
   // Returns the favicon of the current page.
-  virtual SkBitmap GetFavicon() const = 0;
+  virtual gfx::Image GetFavicon() const = 0;
 
   // Returns the title of the current page.
   virtual string16 GetTitle() const = 0;