Allow various font weights in gfx.

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 "third_party/skia/include/core/SkBitmap.h"
@@ skipping 254 matching lines @@
       [[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, LabelFontList) {
   Delegate delegate;
   const gfx::FontList& bold =
-      ResourceBundle::GetSharedInstance().GetFontListWithDelta(0,
-                                                               gfx::Font::BOLD);
+      ResourceBundle::GetSharedInstance().GetFontListWithDelta(
+          0, gfx::Font::NORMAL, gfx::Font::Weight::BOLD);
   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]);
 
@@ skipping 105 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