Allow various font weights in gfx.

ui/views/controls/button/label_button_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/views/controls/button/label_button.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 329 matching lines @@
   EXPECT_EQ(original_width, button_->GetPreferredSize().width());
 }
 
 // Ensure the label gets the correct style for default buttons (e.g. bolding)
 // and button size updates correctly. Regression test for crbug.com/578722.
 TEST_F(LabelButtonTest, ButtonStyleIsDefaultStyle) {
   TestLabelButton* button = AddStyledButton("Save", false);
   gfx::Size non_default_size = button->label()->size();
   EXPECT_EQ(button->label()->GetPreferredSize().width(),
             non_default_size.width());
-  EXPECT_FALSE(button->label()->font_list().GetFontStyle() & gfx::Font::BOLD);
+  EXPECT_EQ(button->label()->font_list().GetFontWeight(),
+            gfx::Font::Weight::NORMAL);
   EXPECT_EQ(styled_normal_text_color_, button->label()->enabled_color());
   button->SetIsDefault(true);
   button->SizeToPreferredSize();
   button->Layout();
   EXPECT_EQ(styled_highlight_text_color_, button->label()->enabled_color());
   if (PlatformStyle::kDefaultLabelButtonHasBoldFont) {
     EXPECT_NE(non_default_size, button->label()->size());
-    EXPECT_TRUE(button->label()->font_list().GetFontStyle() & gfx::Font::BOLD);
+    EXPECT_EQ(button->label()->font_list().GetFontWeight(),
+              gfx::Font::Weight::BOLD);
   } else {
     EXPECT_EQ(non_default_size, button->label()->size());
-    EXPECT_FALSE(button->label()->font_list().GetFontStyle() & gfx::Font::BOLD);
+    EXPECT_EQ(button->label()->font_list().GetFontWeight(),
+              gfx::Font::Weight::NORMAL);
   }
 }
 
 // Ensure the label gets the correct style when pressed or becoming default.
 TEST_F(LabelButtonTest, HighlightedButtonStyle) {
 #if defined(OS_MACOSX)
   // On Mac, ensure the normal and highlight colors are different, to ensure the
   // tests are actually testing something. This might be the case on other
   // platforms.
   EXPECT_NE(styled_normal_text_color_, styled_highlight_text_color_);
@@ skipping 134 matching lines @@
 
 // Verifies the target event handler View is the |LabelButton| and not any of
 // the child Views.
 TEST_F(InkDropLabelButtonTest, TargetEventHandler) {
   View* target_view = widget_->GetRootView()->GetEventHandlerForPoint(
       button_->bounds().CenterPoint());
   EXPECT_EQ(button_, target_view);
 }
 
 }  // namespace views