Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

ui/views/controls/menu/menu.cc

Index: ui/views/controls/menu/menu.cc
diff --git a/ui/views/controls/menu/menu.cc b/ui/views/controls/menu/menu.cc
index 2607cde8d9fd4730f78f00a0771f33c21a2c82fb..fd75b9ea2c509a6c87e091060872c9e77952a4e5 100644
--- a/ui/views/controls/menu/menu.cc
+++ b/ui/views/controls/menu/menu.cc
@@ -5,7 +5,7 @@
 #include "ui/views/controls/menu/menu.h"
 
 #include "base/i18n/rtl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace views {
 
@@ -13,8 +13,8 @@ bool Menu::Delegate::IsRightToLeftUILayout() const {
   return base::i18n::IsRTL();
 }
 
-const SkBitmap& Menu::Delegate::GetEmptyIcon() const {
-  static const SkBitmap* empty_icon = new SkBitmap();
+const gfx::ImageSkia& Menu::Delegate::GetEmptyIcon() const {
+  static const gfx::ImageSkia* empty_icon = new gfx::ImageSkia();
   return *empty_icon;
 }
 
@@ -44,7 +44,7 @@ void Menu::AddMenuItem(int index,
   if (type == SEPARATOR)
     AddSeparator(index);
   else
-    AddMenuItemInternal(index, item_id, label, SkBitmap(), type);
+    AddMenuItemInternal(index, item_id, label, gfx::ImageSkia(), type);
 }
 
 Menu* Menu::AppendSubMenu(int item_id, const string16& label) {
@@ -52,12 +52,12 @@ Menu* Menu::AppendSubMenu(int item_id, const string16& label) {
 }
 
 Menu* Menu::AddSubMenu(int index, int item_id, const string16& label) {
-  return AddSubMenuWithIcon(index, item_id, label, SkBitmap());
+  return AddSubMenuWithIcon(index, item_id, label, gfx::ImageSkia());
 }
 
 Menu* Menu::AppendSubMenuWithIcon(int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon) {
+                                  const gfx::ImageSkia& icon) {
   return AddSubMenuWithIcon(-1, item_id, label, icon);
 }
 
@@ -85,14 +85,14 @@ void Menu::AppendSeparator() {
 
 void Menu::AppendMenuItemWithIcon(int item_id,
                                   const string16& label,
-                                  const SkBitmap& icon) {
+                                  const gfx::ImageSkia& icon) {
   AddMenuItemWithIcon(-1, item_id, label, icon);
 }
 
 void Menu::AddMenuItemWithIcon(int index,
                                int item_id,
                                const string16& label,
-                               const SkBitmap& icon) {
+                               const gfx::ImageSkia& icon) {
   AddMenuItemInternal(index, item_id, label, icon, Menu::NORMAL);
 }