Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/omnibox/omnibox_edit_model.h

Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 4a02f331119d179bb2862990e3c5b33916800224..a2afe323c9bfb209fd7f0ff52b7109a28a128e90 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -25,9 +25,9 @@ class OmniboxEditController;
 class OmniboxPopupModel;
 class OmniboxView;
 class Profile;
-class SkBitmap;
 
 namespace gfx {
+class Image;
 class Rect;
 }
 
@@ -80,7 +80,7 @@ class OmniboxEditModel : public AutocompleteControllerDelegate {
 
   // Called when the user wants to export the entire current text as a URL.
   // Sets the url, and if known, the title and favicon.
-  void GetDataForURLExport(GURL* url, string16* title, SkBitmap* favicon);
+  void GetDataForURLExport(GURL* url, string16* title, gfx::Image* favicon);
 
   // Returns true if a verbatim query should be used for Instant. A verbatim
   // query is forced in certain situations, such as pressing delete at the end