diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 23:03:25 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 23:03:25 +0000 |
| commit | dbc3c1a2985abc605e799522dda1a817305bd490 (patch) | |
| tree | f2567da0ea4314e5b17e06913eb84f40f8048bcf /ui | |
| parent | 075d8aae89b630b505f97f437e665cf1968eb4c0 (diff) | |
| download | chromium_src-dbc3c1a2985abc605e799522dda1a817305bd490.zip chromium_src-dbc3c1a2985abc605e799522dda1a817305bd490.tar.gz chromium_src-dbc3c1a2985abc605e799522dda1a817305bd490.tar.bz2 | |
Reenable PlatformFontPangoTest.FamilyList on Chrome OS.
This passes on try servers now. The cause of the failures
a year ago is unclear but suggests a font configuration issue
on the bots.
BUG=124451
TBR=asvitkine@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13144015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/platform_font_pango_unittest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ui/gfx/platform_font_pango_unittest.cc b/ui/gfx/platform_font_pango_unittest.cc index 24c9aa9..faa6c1c 100644 --- a/ui/gfx/platform_font_pango_unittest.cc +++ b/ui/gfx/platform_font_pango_unittest.cc @@ -12,16 +12,9 @@ namespace gfx { -// Fails on Chrome OS: http://crbug.com/124451 -#if defined(OS_CHROMEOS) -#define MAYBE_FamilyList DISABLED_FamilyList -#else -#define MAYBE_FamilyList FamilyList -#endif - // Test that PlatformFontPango is able to cope with PangoFontDescriptions // containing multiple font families. The first family should be preferred. -TEST(PlatformFontPangoTest, MAYBE_FamilyList) { +TEST(PlatformFontPangoTest, FamilyList) { ScopedPangoFontDescription desc( pango_font_description_from_string("Arial,Times New Roman, 13px")); scoped_refptr<gfx::PlatformFontPango> font( |