Refactor: Makes menus use gfx::FontList instead of gfx::Font.

ui/base/cocoa/menu_controller_unittest.mm

 // Copyright 2013 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/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 92 matching lines @@
     }
   }
   void SetDynamicLabel(base::string16 label) { label_ = label; }
   void SetDynamicIcon(const gfx::Image& icon) { icon_ = icon; }
 
  private:
   base::string16 label_;
   gfx::Image icon_;
 };
 
-// Menu model that returns a gfx::Font object for one of the items in the menu.
-class FontMenuModel : public SimpleMenuModel {
+// Menu model that returns a gfx::FontList object for one of the items in the
+// menu.
+class FontListMenuModel : public SimpleMenuModel {
  public:
-  FontMenuModel(SimpleMenuModel::Delegate* delegate,
-                const gfx::Font* font, int index)
+  FontListMenuModel(SimpleMenuModel::Delegate* delegate,
+                    const gfx::FontList* font_list, int index)
       : SimpleMenuModel(delegate),
-        font_(font),
+        font_list_(font_list),
         index_(index) {
   }
-  virtual ~FontMenuModel() {}
-  virtual const gfx::Font* GetLabelFontAt(int index) const OVERRIDE {
-    return (index == index_) ? font_ : NULL;
+  virtual ~FontListMenuModel() {}
+  virtual const gfx::FontList* GetLabelFontListAt(int index) const OVERRIDE {
+    return (index == index_) ? font_list_ : NULL;
   }
 
  private:
-  const gfx::Font* font_;
+  const gfx::FontList* font_list_;
   const int index_;
 };
 
 TEST_F(MenuControllerTest, EmptyMenu) {
   Delegate delegate;
   SimpleMenuModel model(&delegate);
   base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 0);
 }
@@ skipping 126 matching lines @@
   model.AddSubMenuWithStringId(3, kTestLabelResourceId, &submodel);
 
   base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 3);
 
   Validate(menu.get(), [menu menu]);
 }
 
 // Tests that items which have a font set actually use that font.
-TEST_F(MenuControllerTest, LabelFont) {
+TEST_F(MenuControllerTest, LabelFontList) {
   Delegate delegate;
-  gfx::Font bold = (gfx::Font()).DeriveFont(0, gfx::Font::BOLD);
-  FontMenuModel model(&delegate, &bold, 0);
+  const gfx::FontList& bold = ResourceBundle::GetSharedInstance().GetFontList(
+      ResourceBundle::BoldFont);
+  FontListMenuModel model(&delegate, &bold, 0);
   model.AddItem(1, ASCIIToUTF16("one"));
   model.AddItem(2, ASCIIToUTF16("two"));
 
   base::scoped_nsobject<MenuController> menu(
       [[MenuController alloc] initWithModel:&model useWithPopUpButtonCell:NO]);
   EXPECT_EQ([[menu menu] numberOfItems], 2);
 
   Validate(menu.get(), [menu menu]);
 
   EXPECT_TRUE([[[menu menu] itemAtIndex:0] attributedTitle] != nil);
@@ skipping 103 matching lines @@
   // Pump the task that notifies the delegate.
   message_loop.RunUntilIdle();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }
 
 }  // namespace
 
 }  // namespace ui