Allow various font weights in gfx.

ui/gfx/font_unittest.cc

Index: ui/gfx/font_unittest.cc
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
index 2552b13ee9be505a931be43b50da54294766d9fe..2decb298a4c8535918a3de9584f7a3f4e32b444c 100644
--- a/ui/gfx/font_unittest.cc
+++ b/ui/gfx/font_unittest.cc
@@ -70,11 +70,12 @@ TEST_F(FontTest, MAYBE_LoadArial) {
 #endif
 TEST_F(FontTest, MAYBE_LoadArialBold) {
   Font cf("Arial", 16);
-  Font bold(cf.Derive(0, Font::BOLD));
+  Font bold(cf.Derive(0, Font::NORMAL, Font::WEIGHT_BOLD));
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS)
   EXPECT_TRUE(bold.GetNativeFont());
 #endif
-  EXPECT_EQ(bold.GetStyle(), Font::BOLD);
+  EXPECT_EQ(bold.GetStyle(), Font::NORMAL);
+  EXPECT_EQ(bold.GetWeight(), Font::WEIGHT_BOLD);
   EXPECT_EQ("arial", base::ToLowerASCII(cf.GetActualFontNameForTesting()));
 }
 
@@ -163,7 +164,7 @@ TEST_F(FontTest, DeriveResizesIfSizeTooSmall) {
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
-  Font derived_font = cf.Derive(-4, cf.GetStyle());
+  Font derived_font = cf.Derive(-4, cf.GetStyle(), cf.GetWeight());
   EXPECT_EQ(5, derived_font.GetFontSize());
 }
 
@@ -172,7 +173,7 @@ TEST_F(FontTest, DeriveKeepsOriginalSizeIfHeightOk) {
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
-  Font derived_font = cf.Derive(-2, cf.GetStyle());
+  Font derived_font = cf.Derive(-2, cf.GetStyle(), cf.GetWeight());
   EXPECT_EQ(6, derived_font.GetFontSize());
 }
 #endif  // defined(OS_WIN)