| Index: ui/gfx/render_text_unittest.cc
|
| diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
|
| index 35264c5500968b02f95e2fe1f91ae6af99409930..45739684307b286a4c6ad56c23842a76f02e1c5c 100644
|
| --- a/ui/gfx/render_text_unittest.cc
|
| +++ b/ui/gfx/render_text_unittest.cc
|
| @@ -1156,8 +1156,7 @@ TEST_F(RenderTextTest, StringSizeEmptyString) {
|
| }
|
| #endif // !defined(OS_MACOSX)
|
|
|
| -// Disabled. http://crbug.com/316955
|
| -TEST_F(RenderTextTest, DISABLED_StringSizeRespectsFontListMetrics) {
|
| +TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) {
|
| // Check that Arial and Symbol have different font metrics.
|
| Font arial_font("Arial", 16);
|
| Font symbol_font("Symbol", 16);
|
| @@ -1213,8 +1212,7 @@ TEST_F(RenderTextTest, SetFont) {
|
| EXPECT_EQ(12, render_text->GetPrimaryFont().GetFontSize());
|
| }
|
|
|
| -// Disabled. http://crbug.com/316955
|
| -TEST_F(RenderTextTest, DISABLED_SetFontList) {
|
| +TEST_F(RenderTextTest, SetFontList) {
|
| scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| render_text->SetFontList(FontList("Arial,Symbol, 13px"));
|
| const std::vector<Font>& fonts = render_text->font_list().GetFonts();
|
|
|