Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/harmony/layout_provider_unittest.cc

 // Copyright 2017 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 "chrome/browser/ui/views/chrome_views_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/default_style.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/style/typography.h"
 #include "ui/views/style/typography_provider.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 // Check legacy font sizes. No new code should be using these constants, but if
 // these tests ever fail it probably means something in the old UI will have
 // changed by mistake.
 // Disabled since this relies on machine configuration. http://crbug.com/701241.
-TEST(LayoutDelegateTest, DISABLED_LegacyFontSizeConstants) {
+TEST(LayoutProviderTest, DISABLED_LegacyFontSizeConstants) {
   ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::FontList label_font = rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
 
   EXPECT_EQ(12, label_font.GetFontSize());
   EXPECT_EQ(15, label_font.GetHeight());
   EXPECT_EQ(12, label_font.GetBaseline());
   EXPECT_EQ(9, label_font.GetCapHeight());
 // Note some Windows bots report 11,13,11,9 for the above.
 // TODO(tapted): Smoke them out and figure out why.
 
@@ skipping 67 matching lines @@
 }
 
 // Check that asking for fonts of a given size match the Harmony spec. If these
 // tests fail, the Harmony TypographyProvider needs to be updated to handle the
 // new font properties. For example, when title_font.GetHeight() returns 19, the
 // Harmony TypographyProvider adds 3 to obtain its target height of 22. If a
 // platform starts returning 18 in a standard configuration then the
 // TypographyProvider must add 4 instead. We do this so that Chrome adapts
 // correctly to _non-standard_ system font configurations on user machines.
 // Disabled since this relies on machine configuration. http://crbug.com/701241.
-TEST(LayoutDelegateTest, DISABLED_RequestFontBySize) {
+TEST(LayoutProviderTest, DISABLED_RequestFontBySize) {
 #if defined(OS_MACOSX)
   constexpr int kBase = 13;
 #else
   constexpr int kBase = 12;
 #endif
   // Harmony spec.
   constexpr int kHeadline = 20;
   constexpr int kTitle = 15;  // Leading 22.
   constexpr int kBody1 = 13;  // Leading 20.
   constexpr int kBody2 = 12;  // Leading 20.
@@ skipping 59 matching lines @@
   EXPECT_EQ(kButton, button_font.GetFontSize());
 
   // Button leading not specified (shouldn't be needed: no multiline buttons).
   EXPECT_EQ(15, button_font.GetHeight());
 }
 
 // Test that the default TypographyProvider correctly maps TextContexts relative
 // to the "base" font in the manner that legacy toolkit-views code expects. This
 // reads the base font configuration at runtime, and only tests font sizes, so
 // should be robust against platform changes.
-TEST(LayoutDelegateTest, FontSizeRelativeToBase) {
+TEST(LayoutProviderTest, FontSizeRelativeToBase) {
   using views::style::GetFont;
 
   constexpr int kStyle = views::style::STYLE_PRIMARY;
 
-  // Typography described in chrome_typography.h requires a ChromeViewsDelegate.
-  ChromeViewsDelegate views_delegate;
+  // Typography described in chrome_typography.h requires a
+  // ChromeLayoutProvider.
+  ChromeLayoutProvider layout_delegate;

[Peter Kasting, 2017/04/12 21:37:44]

Nit: |layout_provider|

[kylix_rd, 2017/04/13 16:45:42]

Done.

 
 // Legacy code measures everything relative to a default-constructed FontList.
 // On Mac, subtract one since that is 13pt instead of 12pt.
 #if defined(OS_MACOSX)
   const int twelve = gfx::FontList().GetFontSize() - 1;
 #else
   const int twelve = gfx::FontList().GetFontSize();
 #endif
 
   EXPECT_EQ(twelve, GetFont(CONTEXT_BODY_TEXT_SMALL, kStyle).GetFontSize());
@@ skipping 21 matching lines @@
   EXPECT_EQ(twelve - 1,
             GetFont(CONTEXT_DEPRECATED_SMALL, kStyle).GetFontSize());
 #endif
 }
 
 // Ensure that line height can be overridden by Chrome's TypographyProvider for
 // for the standard set of styles. This varies by platform and test machine
 // configuration. Generally, for a particular platform configuration, there
 // should be a consistent increase in line height when compared to the height of
 // a given font.
-TEST(LayoutDelegateTest, TypographyLineHeight) {
+TEST(LayoutProviderTest, TypographyLineHeight) {
   constexpr int kStyle = views::style::STYLE_PRIMARY;
 
   // Only MD overrides the default line spacing.
   ui::test::MaterialDesignControllerTestAPI md_test_api(
       ui::MaterialDesignController::MATERIAL_NORMAL);
   md_test_api.SetSecondaryUiMaterial(true);
 
-  ChromeViewsDelegate views_delegate;
+  std::unique_ptr<views::LayoutProvider> layout_delegate =

[Peter Kasting, 2017/04/12 21:37:44]

Nit: |layout_provider|; can just be created on the stack as above, no need for
unique_ptr

[kylix_rd, 2017/04/13 16:45:42]

Not really. It needs to create the HarmonyLayoutProvicer (the lines above force
Harmony mode). This exercises the CreateLayoutProvider() provider selection code
as well.

+      ChromeLayoutProvider::CreateLayoutProvider();
 
   constexpr struct {
     int context;
     int min;
     int max;
   } kExpectedIncreases[] = {{CONTEXT_HEADLINE, 4, 8},
                             {views::style::CONTEXT_DIALOG_TITLE, 2, 4},
                             {CONTEXT_BODY_TEXT_LARGE, 3, 4},
                             {CONTEXT_BODY_TEXT_SMALL, 5, 5}};
 
   for (size_t i = 0; i < arraysize(kExpectedIncreases); ++i) {
     SCOPED_TRACE(testing::Message() << "Testing index: " << i);
     const auto& increase = kExpectedIncreases[i];
     const gfx::FontList& font = views::style::GetFont(increase.context, kStyle);
     int line_spacing = views::style::GetLineHeight(increase.context, kStyle);
     EXPECT_GE(increase.max, line_spacing - font.GetHeight());
     EXPECT_LE(increase.min, line_spacing - font.GetHeight());
   }
 
   // Buttons should specify zero line height (i.e. use the font's height) so
   // buttons have flexibility to configure their own spacing.
   EXPECT_EQ(0,
             views::style::GetLineHeight(views::style::CONTEXT_BUTTON, kStyle));
 }