Get all font unittests running with DirectWrite on Windows 7+

ui/gfx/font_list_unittest.cc

Index: ui/gfx/font_list_unittest.cc
diff --git a/ui/gfx/font_list_unittest.cc b/ui/gfx/font_list_unittest.cc
index 6dcbb855d083d4483fb3e85e110cad02714fe174..2af4aa508920aca567f36d44e2a82a413adfc491 100644
--- a/ui/gfx/font_list_unittest.cc
+++ b/ui/gfx/font_list_unittest.cc
@@ -266,24 +266,32 @@ TEST(FontListTest, Fonts_GetHeight_GetBaseline) {
   EXPECT_EQ(font1.GetBaseline(), font_list1.GetBaseline());
 
   // If there are two different fonts, the font list returns the max value
-  // for ascent and descent.
+  // for the baseline (ascent) and height.
   Font font2("Symbol", 16);
   ASSERT_EQ("symbol",
             base::StringToLowerASCII(font2.GetActualFontNameForTesting()));
   EXPECT_NE(font1.GetBaseline(), font2.GetBaseline());
-  EXPECT_NE(font1.GetHeight() - font1.GetBaseline(),
-            font2.GetHeight() - font2.GetBaseline());
+  EXPECT_NE(font1.GetHeight(), font2.GetHeight());
   std::vector<Font> fonts;
   fonts.push_back(font1);
   fonts.push_back(font2);
   FontList font_list_mix(fonts);
-  // ascent of FontList == max(ascent of Fonts)
-  EXPECT_EQ(std::max(font1.GetHeight() - font1.GetBaseline(),
-                     font2.GetHeight() - font2.GetBaseline()),
-            font_list_mix.GetHeight() - font_list_mix.GetBaseline());
   // descent of FontList == max(descent of Fonts)

[msw, 2015/01/10 01:50:15]

The baseline is actually the ascent, not descent.

[ananta, 2015/01/10 02:05:49]

Done.

   EXPECT_EQ(std::max(font1.GetBaseline(), font2.GetBaseline()),
             font_list_mix.GetBaseline());
+  // FIXME
+  // The height of the font list should be the max height of the fonts in it.

[msw, 2015/01/10 01:50:15]

Oh darn, my earlier advice was wrong. I remember why this isn't true! Because
FontList applies baseline centering, the ascent and decent will be the max of
the constituent values. The height will not necessarily be the max of its
constituent values. Revert the checks here and make sure they pass.

[ananta, 2015/01/10 02:05:49]

Done.

+  // This is not the case for Mac and should be fixed.
+#if defined(OS_MACOSX)
+  // ascent of FontList == max(ascent of Fonts)
+  EXPECT_EQ(std::max(font1.GetHeight() - font1.GetBaseline(),
+                     font2.GetHeight() - font2.GetBaseline()),
+            font_list_mix.GetHeight() - font_list_mix.GetBaseline());
+#else
+  // Height of FontList == max(Height of Fonts)
+  EXPECT_EQ(std::max(font1.GetHeight(), font2.GetHeight()),
+            font_list_mix.GetHeight());
+#endif
 }
 
 TEST(FontListTest, Fonts_DeriveWithHeightUpperBound) {