Enables font-related unittests again.

ui/gfx/font_list_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_list.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Helper function for comparing fonts for equality.
 std::string FontToString(const gfx::Font& font) {
   std::string font_string = font.GetFontName();
   font_string += "|";
   font_string += base::IntToString(font.GetFontSize());
   int style = font.GetStyle();
@@ skipping 260 matching lines @@
 
   FontList derived =
       font_list.DeriveFontListWithSizeDeltaAndStyle(5, Font::BOLD);
   const std::vector<Font>& derived_fonts = derived.GetFonts();
 
   EXPECT_EQ(2U, derived_fonts.size());
   EXPECT_EQ("Arial|13|bold", FontToString(derived_fonts[0]));
   EXPECT_EQ("Sans serif|13|bold", FontToString(derived_fonts[1]));
 }
 
-// Disabled. http://crbug.com/316955
-TEST(FontListTest, DISABLED_Fonts_GetHeight_GetBaseline) {
+TEST(FontListTest, Fonts_GetHeight_GetBaseline) {
   // If a font list has only one font, the height and baseline must be the same.
   Font font1("Arial", 16);
+  ASSERT_EQ("arial", StringToLowerASCII(font1.GetActualFontNameForTesting()));
   FontList font_list1("Arial, 16px");
   EXPECT_EQ(font1.GetHeight(), font_list1.GetHeight());
   EXPECT_EQ(font1.GetBaseline(), font_list1.GetBaseline());
 
   // If there are two different fonts, the font list returns the max value
   // for ascent and descent.
   Font font2("Symbol", 16);
+  ASSERT_EQ("symbol", StringToLowerASCII(font2.GetActualFontNameForTesting()));
   EXPECT_NE(font1.GetBaseline(), font2.GetBaseline());
   EXPECT_NE(font1.GetHeight() - font1.GetBaseline(),
             font2.GetHeight() - font2.GetBaseline());
   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)
   EXPECT_EQ(std::max(font1.GetBaseline(), font2.GetBaseline()),
             font_list_mix.GetBaseline());
 }
 
 }  // namespace gfx