Use views::style for buttons, bootstrap ash_typography to do so.

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/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 26 matching lines @@
   return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
 }
 
 }  // namespace
 
 namespace views {
 
 // Testing button that exposes protected methods.
 class TestLabelButton : public LabelButton {
  public:
-  explicit TestLabelButton(const base::string16& text = base::string16())
-      : LabelButton(nullptr, text) {}
+  explicit TestLabelButton(const base::string16& text = base::string16(),
+                           int button_context = style::CONTEXT_BUTTON)
+      : LabelButton(nullptr, text, button_context) {}
 
   using LabelButton::label;
   using LabelButton::image;
   using LabelButton::ResetColorsFromNativeTheme;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestLabelButton);
 };
 
 class LabelButtonTest : public test::WidgetTest {
@@ skipping 82 matching lines @@
   EXPECT_EQ(button.style(), Button::STYLE_TEXTBUTTON);
   EXPECT_EQ(Button::STATE_NORMAL, button.state());
 
   EXPECT_EQ(button.image()->parent(), &button);
   EXPECT_EQ(button.label()->parent(), &button);
 }
 
 TEST_F(LabelButtonTest, Label) {
   EXPECT_TRUE(button_->GetText().empty());
 
-  const gfx::FontList font_list;
+  const gfx::FontList font_list = button_->label()->font_list();
   const base::string16 short_text(ASCIIToUTF16("abcdefghijklm"));
   const base::string16 long_text(ASCIIToUTF16("abcdefghijklmnopqrstuvwxyz"));
   const int short_text_width = gfx::GetStringWidth(short_text, font_list);
   const int long_text_width = gfx::GetStringWidth(long_text, font_list);
 
   // The width increases monotonically with string size (it does not shrink).
   EXPECT_LT(button_->GetPreferredSize().width(), short_text_width);
   button_->SetText(short_text);
   EXPECT_GT(button_->GetPreferredSize().height(), font_list.GetHeight());
   EXPECT_GT(button_->GetPreferredSize().width(), short_text_width);
@@ skipping 69 matching lines @@
   button_->SetMaxSize(gfx::Size(large_size, 1));
   EXPECT_EQ(button_->GetPreferredSize(), gfx::Size(large_size, 1));
 
   // Clear the monotonically increasing minimum size.
   button_->SetMinSize(gfx::Size());
   EXPECT_GT(button_->GetPreferredSize().width(), small_size);
   EXPECT_LT(button_->GetPreferredSize().width(), large_size);
 }
 
 TEST_F(LabelButtonTest, LabelAndImage) {
-  const gfx::FontList font_list;
+  const gfx::FontList font_list = button_->label()->font_list();
   const base::string16 text(ASCIIToUTF16("abcdefghijklm"));
   const int text_width = gfx::GetStringWidth(text, font_list);
 
   const int image_size = 50;
   const gfx::ImageSkia image = CreateTestImage(image_size, image_size);
   ASSERT_LT(font_list.GetHeight(), image_size);
 
   // The width increases monotonically with content size (it does not shrink).
   EXPECT_LT(button_->GetPreferredSize().width(), text_width);
   EXPECT_LT(button_->GetPreferredSize().width(), image_size);
@@ skipping 37 matching lines @@
   button_->SetMaxSize(gfx::Size(image_size, 1));
   EXPECT_EQ(button_->GetPreferredSize(), gfx::Size(image_size, 1));
 
   // Clear the monotonically increasing minimum size.
   button_->SetMinSize(gfx::Size());
   EXPECT_LT(button_->GetPreferredSize().width(), text_width);
   EXPECT_LT(button_->GetPreferredSize().width(), image_size);
   EXPECT_LT(button_->GetPreferredSize().height(), image_size);
 }
 
-TEST_F(LabelButtonTest, AdjustFontSize) {
-  button_->SetText(base::ASCIIToUTF16("abc"));
+// Ensure that the text used for button labels correctly adjusts in response
+// to provided style::TextContext values.
+TEST_F(LabelButtonTest, TextSizeFromContext) {
+  constexpr style::TextContext kDefaultContext = style::CONTEXT_BUTTON;
 
-  const int original_width = button_->GetPreferredSize().width();
-  const int original_height = button_->GetPreferredSize().height();
+  // Although CONTEXT_DIALOG_TITLE isn't used for buttons, picking a style with
+  // a small delta risks finding a font with a different point-size but with the
+  // same maximum glyph height.
+  constexpr style::TextContext kAlternateContext = style::CONTEXT_DIALOG_TITLE;
+
+  // First sanity that the TextConstants used in the test give different sizes.
+  int default_delta, alternate_delta;
+  gfx::Font::Weight default_weight, alternate_weight;
+  DefaultTypographyProvider::GetDefaultFont(
+      kDefaultContext, style::STYLE_PRIMARY, &default_delta, &default_weight);
+  DefaultTypographyProvider::GetDefaultFont(
+      kAlternateContext, style::STYLE_PRIMARY, &alternate_delta,
+      &alternate_weight);
+  EXPECT_LT(default_delta, alternate_delta);
+
+  const base::string16 text(ASCIIToUTF16("abcdefghijklm"));
+  button_->SetText(text);
+  EXPECT_EQ(default_delta, button_->label()->font_list().GetFontSize() -
+                               gfx::FontList().GetFontSize());
+
+  TestLabelButton* alternate_button =
+      new TestLabelButton(text, kAlternateContext);
+  button_->parent()->AddChildView(alternate_button);
+  EXPECT_EQ(alternate_delta,
+            alternate_button->label()->font_list().GetFontSize() -
+                gfx::FontList().GetFontSize());
 
   // The button size increases when the font size is increased.
-  button_->AdjustFontSize(100);
-  EXPECT_GT(button_->GetPreferredSize().width(), original_width);
-  EXPECT_GT(button_->GetPreferredSize().height(), original_height);
-
-  // The button returns to its original size when the minimal size is cleared
-  // and the original font size is restored.
-  button_->SetMinSize(gfx::Size());
-  button_->AdjustFontSize(-100);
-  EXPECT_EQ(original_width, button_->GetPreferredSize().width());
-  EXPECT_EQ(original_height, button_->GetPreferredSize().height());
+  EXPECT_LT(button_->GetPreferredSize().width(),
+            alternate_button->GetPreferredSize().width());
+  EXPECT_LT(button_->GetPreferredSize().height(),
+            alternate_button->GetPreferredSize().height());
 }
 
 TEST_F(LabelButtonTest, ChangeTextSize) {
   const base::string16 text(ASCIIToUTF16("abc"));
   const base::string16 longer_text(ASCIIToUTF16("abcdefghijklm"));
   button_->SetText(text);
   button_->SizeToPreferredSize();
   gfx::Rect bounds(button_->bounds());
   const int original_width = button_->GetPreferredSize().width();
   EXPECT_EQ(original_width, bounds.width());
@@ skipping 183 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