Index: ui/gfx/platform_font_pango_unittest.cc |
=================================================================== |
--- ui/gfx/platform_font_pango_unittest.cc (revision 137485) |
+++ ui/gfx/platform_font_pango_unittest.cc (working copy) |
@@ -10,6 +10,8 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/gfx/pango_util.h" |
+namespace gfx { |
+ |
// Fails on Chrome OS: http://crbug.com/124451 |
#if defined(OS_CHROMEOS) |
#define MAYBE_FamilyList FAILS_FamilyList |
@@ -20,16 +22,19 @@ |
// Test that PlatformFontPango is able to cope with PangoFontDescriptions |
// containing multiple font families. The first family should be preferred. |
TEST(PlatformFontPangoTest, MAYBE_FamilyList) { |
- PangoFontDescription* desc = |
- pango_font_description_from_string("Arial,Times New Roman, 13px"); |
- scoped_refptr<gfx::PlatformFontPango> font(new gfx::PlatformFontPango(desc)); |
- pango_font_description_free(desc); |
+ ScopedPangoFontDescription desc( |
+ pango_font_description_from_string("Arial,Times New Roman, 13px")); |
+ scoped_refptr<gfx::PlatformFontPango> font( |
+ new gfx::PlatformFontPango(desc.get())); |
EXPECT_EQ("Arial", font->GetFontName()); |
EXPECT_EQ(13, font->GetFontSize()); |
- desc = pango_font_description_from_string("Times New Roman,Arial, 15px"); |
- scoped_refptr<gfx::PlatformFontPango> font2(new gfx::PlatformFontPango(desc)); |
- pango_font_description_free(desc); |
+ ScopedPangoFontDescription desc2( |
+ pango_font_description_from_string("Times New Roman,Arial, 15px")); |
+ scoped_refptr<gfx::PlatformFontPango> font2( |
+ new gfx::PlatformFontPango(desc2.get())); |
EXPECT_EQ("Times New Roman", font2->GetFontName()); |
EXPECT_EQ(15, font2->GetFontSize()); |
} |
+ |
+} // namespace gfx |