Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/omnibox/omnibox_edit_model.cc

Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index d24f566f93c703589f322a80ab82854420ed36f2..b1f348df0cd7c39a29db70b065c534759688aa66 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -55,7 +55,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "googleurl/src/url_util.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image.h"
 
 using content::UserMetricsAction;
 using predictors::AutocompleteActionPredictor;
@@ -275,7 +275,7 @@ void OmniboxEditModel::OnChanged() {
 
 void OmniboxEditModel::GetDataForURLExport(GURL* url,
                                            string16* title,
-                                           SkBitmap* favicon) {
+                                           gfx::Image* favicon) {
   AutocompleteMatch match;
   GetInfoForCurrentText(&match, NULL);
   *url = match.destination_url;