Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm

Index: chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
index 172ff594e08665ed70cf4c9dbd956be9977fa261..e7f56969591a2000406d2763a41acaee3945cdbf 100644
--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm
@@ -10,11 +10,9 @@
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/image/image_skia_util_mac.h"
+#include "ui/gfx/image/image.h"
 
 using base::SysUTF16ToNSString;
-using gfx::NSImageFromImageSkia;
 
 @implementation BackForwardMenuController
 
@@ -71,10 +69,10 @@ using gfx::NSImageFromImageSkia;
               keyEquivalent:@""];
       [menuItem autorelease];
 
-      gfx::ImageSkia icon;
+      gfx::Image icon;
       // Icon (if it has one).
       if (model_->GetIconAt(menuID, &icon))
-        [menuItem setImage:NSImageFromImageSkia(icon)];
+        [menuItem setImage:icon.ToNSImage()];
 
       // This will make it call our |-executeMenuItem:| method. We store the
       // |menuID| (or |menu_id|) in the tag.