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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #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
 
 // Accessors and mutators:
 
 @synthesize type = type_;
 
 // Own methods:
 
 - (id)initWithBrowser:(Browser*)browser
@@ skipping 36 matching lines @@
       [menu insertItem:[NSMenuItem separatorItem]
                atIndex:(menuID + 1)];
     } else {
       // Create a menu item with the right label.
       NSMenuItem* menuItem = [[NSMenuItem alloc]
               initWithTitle:SysUTF16ToNSString(model_->GetLabelAt(menuID))
                      action:nil
               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.
       [menuItem setTag:menuID];
       [menuItem setTarget:self];
       [menuItem setAction:@selector(executeMenuItem:)];
 
       // Put it in the menu!
       [menu insertItem:menuItem
                atIndex:(menuID + 1)];
     }
   }
 }
 
 // Action methods:
 
 - (void)executeMenuItem:(id)sender {
   DCHECK([sender isKindOfClass:[NSMenuItem class]]);
   int menuID = [sender tag];
   int event_flags = event_utils::EventFlagsFromNSEvent([NSApp currentEvent]);
   model_->ActivatedAt(menuID, event_flags);
 }
 
 @end  // @implementation BackForwardMenuController