Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 7a21dffaf2725ab1ebf4117e8c2f641f2278ea5e..251076ffedfa3e793eb69ae7f062b998cd25fd45 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -58,6 +58,7 @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
@@ -2489,11 +2490,11 @@ void OmniboxViewWin::StartDragIfNecessary(const CPoint& point) {
 
   if (write_url) {
     string16 title;
-    SkBitmap favicon;
+    gfx::Image favicon;
     if (is_all_selected)
       model()->GetDataForURLExport(&url, &title, &favicon);
-    button_drag_utils::SetURLAndDragImage(url, title, favicon, &data,
-                                          native_view_host_->GetWidget());
+    button_drag_utils::SetURLAndDragImage(url, title, favicon.AsImageSkia(),
+        &data, native_view_host_->GetWidget());
     supported_modes |= DROPEFFECT_LINK;
     content::RecordAction(UserMetricsAction("Omnibox_DragURL"));
   } else {