Configure font font names in GFX unittests

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"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/font_names_testing.h"
 
 #if defined(OS_WIN)
 #include "ui/gfx/platform_font_win.h"
 #endif
 
 namespace gfx {
 namespace {
 
 using FontTest = testing::Test;
 
@@ skipping 97 matching lines @@
 #define MAYBE_AvgWidths AvgWidths
 #endif
 TEST_F(FontTest, MAYBE_AvgWidths) {
   Font cf("Arial", 16);
   EXPECT_EQ(cf.GetExpectedTextWidth(0), 0);
   EXPECT_GT(cf.GetExpectedTextWidth(1), cf.GetExpectedTextWidth(0));
   EXPECT_GT(cf.GetExpectedTextWidth(2), cf.GetExpectedTextWidth(1));
   EXPECT_GT(cf.GetExpectedTextWidth(3), cf.GetExpectedTextWidth(2));
 }
 
+
+

[Alexei Svitkine (slow), 2016/09/02 15:19:58]

Remove extra added lines.

[drott, 2016/09/02 15:35:54]

Done.

 #if defined(OS_WIN) || defined(OS_ANDROID)
 #define MAYBE_GetActualFontNameForTesting DISABLED_GetActualFontNameForTesting
 #else
 #define MAYBE_GetActualFontNameForTesting GetActualFontNameForTesting
 #endif
 // On Windows, Font::GetActualFontNameForTesting() doesn't work well for now.
 // http://crbug.com/327287
 //
 // Check that fonts used for testing are installed and enabled. On Mac
 // fonts may be installed but still need enabling in Font Book.app.
 // http://crbug.com/347429
 TEST_F(FontTest, MAYBE_GetActualFontNameForTesting) {
   Font arial("Arial", 16);
   EXPECT_EQ("arial", base::ToLowerASCII(arial.GetActualFontNameForTesting()))
       << "********\n"
       << "Your test environment seems to be missing Arial font, which is "
       << "needed for unittests.  Check if Arial font is installed.\n"
       << "********";
-  Font symbol("Symbol", 16);
-  EXPECT_EQ("symbol", base::ToLowerASCII(symbol.GetActualFontNameForTesting()))
+  Font symbol(symbol_font_name, 16);
+  EXPECT_EQ(base::ToLowerASCII(symbol_font_name),
+            base::ToLowerASCII(symbol.GetActualFontNameForTesting()))
       << "********\n"
-      << "Your test environment seems to be missing Symbol font, which is "
-      << "needed for unittests.  Check if Symbol font is installed.\n"
+      << "Your test environment seems to be missing the " << symbol_font_name
+      << " font, which is "
+      << "needed for unittests.  Check if " << symbol_font_name
+      << " font is installed.\n"
       << "********";
 
   const char* const invalid_font_name = "no_such_font_name";
   Font fallback_font(invalid_font_name, 16);
   EXPECT_NE(invalid_font_name,
             base::ToLowerASCII(fallback_font.GetActualFontNameForTesting()));
 }
 
 TEST_F(FontTest, DeriveFont) {
   Font cf("Arial", 8);
@@ skipping 23 matching lines @@
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.Derive(-2, cf.GetStyle(), cf.GetWeight());
   EXPECT_EQ(6, derived_font.GetFontSize());
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace
 }  // namespace gfx