Chromium Code Reviews| Index: ui/gfx/font_unittest.cc |
| diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc |
| index 073ffb51f651370ecf5402d3fa7ed9f6d6179b6f..44737ecbf7c36557b226d30aa3e1dcd7396093b7 100644 |
| --- a/ui/gfx/font_unittest.cc |
| +++ b/ui/gfx/font_unittest.cc |
| @@ -8,7 +8,8 @@ |
| #include "base/strings/utf_string_conversions.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
|
msw
2013/11/04 23:10:46
nit: can you change "#if defined(OS_POSIX) && !def
sadrul
2013/11/05 02:42:27
Done.
|
| + !defined(USE_OZONE) |
| #include <pango/pango.h> |
| #elif defined(OS_WIN) |
| #include "ui/gfx/platform_font_win.h" |
| @@ -22,7 +23,8 @@ class FontTest : public testing::Test { |
| // Fulfills the memory management contract as outlined by the comment at |
| // gfx::Font::GetNativeFont(). |
| void FreeIfNecessary(NativeFont font) { |
| -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
| + !defined(USE_OZONE) |
| pango_font_description_free(font); |
| #endif |
| } |