Allow various font weights in gfx.

ui/gfx/font_unittest.cc

 // 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.
 
 #include "ui/gfx/font.h"
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 52 matching lines @@
   EXPECT_EQ("arial", base::ToLowerASCII(cf.GetActualFontNameForTesting()));
 }
 
 #if defined(OS_ANDROID)
 #define MAYBE_LoadArialBold DISABLED_LoadArialBold
 #else
 #define MAYBE_LoadArialBold LoadArialBold
 #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));

[msw, 2016/03/22 18:24:11]

Update the enum values in this file.

[Mikus, 2016/03/23 17:53:21]

Done.

 #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()));
 }
 
 #if defined(OS_ANDROID)
 #define MAYBE_Ascent DISABLED_Ascent
 #else
 #define MAYBE_Ascent Ascent
 #endif
 TEST_F(FontTest, MAYBE_Ascent) {
   Font cf("Arial", 16);
@@ skipping 68 matching lines @@
   EXPECT_NE(invalid_font_name,
             base::ToLowerASCII(fallback_font.GetActualFontNameForTesting()));
 }
 
 #if defined(OS_WIN)
 TEST_F(FontTest, DeriveResizesIfSizeTooSmall) {
   Font cf("Arial", 8);
   // 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());
 }
 
 TEST_F(FontTest, DeriveKeepsOriginalSizeIfHeightOk) {
   Font cf("Arial", 8);
   // 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)
 
 }  // namespace
 }  // namespace gfx