| Index: ui/gfx/render_text_unittest.cc
|
| diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
|
| index e7f2d2a485b3d992724aea40952418aeb861eb58..b831ad633e5120b561c101f2407ae790207be23a 100644
|
| --- a/ui/gfx/render_text_unittest.cc
|
| +++ b/ui/gfx/render_text_unittest.cc
|
| @@ -19,8 +19,8 @@
|
| #include "ui/gfx/render_text_win.h"
|
| #endif
|
|
|
| -#if defined(OS_LINUX)
|
| -#include "ui/gfx/render_text_linux.h"
|
| +#if defined(OS_LINUX) && !defined(USE_OZONE)
|
| +#include "ui/gfx/render_text_pango.h"
|
| #endif
|
|
|
| #if defined(TOOLKIT_GTK)
|
| @@ -184,7 +184,7 @@ TEST_F(RenderTextTest, ApplyColorAndStyle) {
|
| EXPECT_TRUE(render_text->styles()[ITALIC].EqualsForTesting(expected_italic));
|
| }
|
|
|
| -#if defined(OS_LINUX)
|
| +#if defined(OS_LINUX) && !defined(USE_OZONE)
|
| TEST_F(RenderTextTest, PangoAttributes) {
|
| scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| render_text->SetText(ASCIIToUTF16("012345678"));
|
| @@ -207,7 +207,7 @@ TEST_F(RenderTextTest, PangoAttributes) {
|
| };
|
|
|
| int start = 0, end = 0;
|
| - RenderTextLinux* rt_linux = static_cast<RenderTextLinux*>(render_text.get());
|
| + RenderTextPango* rt_linux = static_cast<RenderTextPango*>(render_text.get());
|
| rt_linux->EnsureLayout();
|
| PangoAttrList* attributes = pango_layout_get_attributes(rt_linux->layout_);
|
| PangoAttrIterator* iter = pango_attr_list_get_iterator(attributes);
|
|
|