Configure font font names in GFX unittests

ui/gfx/font_unittest.cc

Index: ui/gfx/font_unittest.cc
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
index a5ac50888fb9e3f92f172671f602ac4bca297dc7..5f3d3afe1f84b42d97020a6ca9bd69dd6cfe0051 100644
--- a/ui/gfx/font_unittest.cc
+++ b/ui/gfx/font_unittest.cc
@@ -10,6 +10,7 @@
 #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"
@@ -127,6 +128,8 @@ TEST_F(FontTest, MAYBE_AvgWidths) {
   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
@@ -145,11 +148,14 @@ TEST_F(FontTest, MAYBE_GetActualFontNameForTesting) {
       << "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";