Remove GetPlatformFontHeight function

This CL is removing the function GetPlatformFontHeight since it's no
longer needed. It was used to be more complicated to get height of fonts
on windows. Since recent migration, the code is straigh forwards and
font heights are constants.

Address comments left on previous commit
  https://chromium-review.googlesource.com/c/chromium/src/+/1570653


R=tapted@chromium.org
CC=benck@chromium.org

Bug: 701241
Change-Id: I2db7c53914aa9105d5c9390dd98d5266998676c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642735Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Etienne Bergeron <etienneb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666477}

chrome/browser/ui/views/chrome_typography_provider.cc

@@ -107,26 +107,6 @@ SkColor GetHarmonyTextColorForNonStandardNativeTheme(
 
 }  // namespace
 
-#if defined(OS_WIN)
-// static
-int ChromeTypographyProvider::GetPlatformFontHeight(int font_context) {
-  switch (font_context) {
-    case CONTEXT_HEADLINE:
-      return 27;
-    case views::style::CONTEXT_DIALOG_TITLE:
-      return 20;
-    case CONTEXT_BODY_TEXT_LARGE:
-    case CONTEXT_TAB_HOVER_CARD_TITLE:
-    case views::style::CONTEXT_MESSAGE_BOX_BODY_TEXT:
-      return 18;
-    case CONTEXT_BODY_TEXT_SMALL:
-      return 16;
-  }
-  NOTREACHED();
-  return 0;
-}
-#endif
-
 const gfx::FontList& ChromeTypographyProvider::GetFont(int context,
                                                        int style) const {
   // "Target" font size constants.
@@ -284,14 +264,10 @@ int ChromeTypographyProvider::GetLineHeight(int context, int style) const {
   constexpr int kBodyTextLargePlatformHeight = 16;
   constexpr int kBodyTextSmallPlatformHeight = 15;
 #elif defined(OS_WIN)
-  static const int kHeadlinePlatformHeight =
-      GetPlatformFontHeight(CONTEXT_HEADLINE);
-  static const int kTitlePlatformHeight =
-      GetPlatformFontHeight(views::style::CONTEXT_DIALOG_TITLE);
-  static const int kBodyTextLargePlatformHeight =
-      GetPlatformFontHeight(CONTEXT_BODY_TEXT_LARGE);
-  static const int kBodyTextSmallPlatformHeight =
-      GetPlatformFontHeight(CONTEXT_BODY_TEXT_SMALL);
+  constexpr int kHeadlinePlatformHeight = 27;
+  constexpr int kTitlePlatformHeight = 20;
+  constexpr int kBodyTextLargePlatformHeight = 18;
+  constexpr int kBodyTextSmallPlatformHeight = 16;
 #else
   constexpr int kHeadlinePlatformHeight = 24;
   constexpr int kTitlePlatformHeight = 18;

chrome/browser/ui/views/chrome_typography_provider.h

@@ -14,13 +14,6 @@ class ChromeTypographyProvider : public views::TypographyProvider {
  public:
   ChromeTypographyProvider() = default;
 
-#if defined(OS_WIN)
-  // Returns the expected platform font height for the current system
-  // configuration. Different configurations can produce slightly different
-  // results.
-  static int GetPlatformFontHeight(int font_context);
-#endif
-
   // TypographyProvider:
   const gfx::FontList& GetFont(int context, int style) const override;
   SkColor GetColor(const views::View& view,

chrome/browser/ui/views/layout_provider_unittest.cc

@@ -245,8 +245,7 @@ TEST_F(LayoutProviderTest, RequestFontBySize) {
 #if defined(OS_MACOSX)
   EXPECT_EQ(25, headline_font.GetHeight());
 #elif defined(OS_WIN)
-  EXPECT_EQ(ChromeTypographyProvider::GetPlatformFontHeight(CONTEXT_HEADLINE),
-            headline_font.GetHeight());
+  EXPECT_EQ(27, headline_font.GetHeight());
 #else
   EXPECT_EQ(24, headline_font.GetHeight());
 #endif
@@ -268,9 +267,7 @@ TEST_F(LayoutProviderTest, RequestFontBySize) {
 #if defined(OS_MACOSX)
   EXPECT_EQ(16, body1_font.GetHeight());  // Add 4.
 #elif defined(OS_WIN)
-  EXPECT_EQ(
-      ChromeTypographyProvider::GetPlatformFontHeight(CONTEXT_BODY_TEXT_LARGE),
-      body1_font.GetHeight());
+  EXPECT_EQ(18, body1_font.GetHeight());
 #else  // Linux.
   EXPECT_EQ(17, body1_font.GetHeight());  // Add 3.
 #endif
@@ -279,9 +276,7 @@ TEST_F(LayoutProviderTest, RequestFontBySize) {
 
 // Body2 font leading should be 20.
 #if defined(OS_WIN)
-  EXPECT_EQ(
-      ChromeTypographyProvider::GetPlatformFontHeight(CONTEXT_BODY_TEXT_SMALL),
-      body2_font.GetHeight());
+  EXPECT_EQ(16, body2_font.GetHeight());
 #else
   EXPECT_EQ(15, body2_font.GetHeight());  // Other platforms: Add 5.
 #endif
@@ -290,9 +285,7 @@ TEST_F(LayoutProviderTest, RequestFontBySize) {
 
 // Button leading not specified (shouldn't be needed: no multiline buttons).
 #if defined(OS_WIN)
-  EXPECT_EQ(
-      ChromeTypographyProvider::GetPlatformFontHeight(CONTEXT_BODY_TEXT_SMALL),
-      button_font.GetHeight());
+  EXPECT_EQ(16, button_font.GetHeight());
 #else
   EXPECT_EQ(15, button_font.GetHeight());
 #endif