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

chrome/browser/ui/cocoa/menu_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/menu_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image.h"
 
 namespace {
 
 class MenuControllerTest : public CocoaTest {
 };
 
 // A menu delegate that counts the number of times certain things are called
 // to make sure things are hooked up properly.
 class Delegate : public ui::SimpleMenuModel::Delegate {
  public:
@@ skipping 40 matching lines @@
   // MenuWillShow.
   NSMenu* menu_to_close_;
   bool did_show_;
   bool did_close_;
 };
 
 // Just like Delegate, except the items are treated as "dynamic" so updates to
 // the label/icon in the model are reflected in the menu.
 class DynamicDelegate : public Delegate {
  public:
-  DynamicDelegate() : icon_(NULL) {}
+  DynamicDelegate() {}
   virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; }
   virtual string16 GetLabelForCommandId(int command_id) const { return label_; }
-  virtual bool GetIconForCommandId(int command_id, gfx::ImageSkia* icon) const {
-    if (icon_) {
-      *icon = *icon_;
+  virtual bool GetIconForCommandId(int command_id, gfx::Image* icon) const {
+    if (icon_.IsEmpty()) {
+      return false;
+    } else {
+      *icon = icon_;
       return true;
-    } else {
-      return false;
     }
   }
   void SetDynamicLabel(string16 label) { label_ = label; }
-  void SetDynamicIcon(SkBitmap* icon) { icon_ = icon; }
+  void SetDynamicIcon(const gfx::Image& icon) { icon_ = icon; }
 
  private:
   string16 label_;
-  SkBitmap* icon_;
+  gfx::Image icon_;
 };
 
 TEST_F(MenuControllerTest, EmptyMenu) {
   Delegate delegate;
   ui::SimpleMenuModel model(&delegate);
   scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 0);
 }
 
@@ skipping 168 matching lines @@
   // initialized after this so we can validate the menu contents.
   Validate(menu.get(), [menu menu]);
   NSMenuItem* item = [[menu menu] itemAtIndex:0];
   // Item should have the "initial" label and no icon.
   EXPECT_EQ(initial, base::SysNSStringToUTF16([item title]));
   EXPECT_EQ(nil, [item image]);
 
   // Now update the item to have a label of "second" and an icon.
   string16 second = ASCIIToUTF16("second");
   delegate.SetDynamicLabel(second);
-  SkBitmap* bitmap =
-      ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_THROBBER);
-  delegate.SetDynamicIcon(bitmap);
+  const gfx::Image& icon =
+      ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_THROBBER);
+  delegate.SetDynamicIcon(icon);
   // Simulate opening the menu and validate that the item label + icon changes.
   Validate(menu.get(), [menu menu]);
   EXPECT_EQ(second, base::SysNSStringToUTF16([item title]));
   EXPECT_TRUE([item image] != nil);
 
   // Now get rid of the icon and make sure it goes away.
-  delegate.SetDynamicIcon(NULL);
+  delegate.SetDynamicIcon(gfx::Image());
   Validate(menu.get(), [menu menu]);
   EXPECT_EQ(second, base::SysNSStringToUTF16([item title]));
   EXPECT_EQ(nil, [item image]);
 }
 
 TEST_F(MenuControllerTest, OpenClose) {
   // ui::SimpleMenuModel posts a task that calls Delegate::MenuClosed. Create
   // a MessageLoop for that purpose.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
 
@@ skipping 24 matching lines @@
   EXPECT_FALSE(delegate.did_close_);
 
   // Pump the task that notifies the delegate.
   message_loop.RunAllPending();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace