Index: ui/gfx/render_text.cc |
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc |
index 2a50169fbb16f7b5fb17fc341985ee5559c28c4f..2bdb969262f95c38d7f99ff23521d70e27645784 100644 |
--- a/ui/gfx/render_text.cc |
+++ b/ui/gfx/render_text.cc |
@@ -393,21 +393,9 @@ RenderText::~RenderText() { |
} |
RenderText* RenderText::CreateInstance() { |
- if (CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableHarfBuzzRenderText)) { |
- return new RenderTextHarfBuzz; |
- } |
- if (CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kDisableHarfBuzzRenderText)) { |
- return CreateNativeInstance(); |
- } |
- |
-// Disable on Chrome OS. Blocked on http://crbug.com/423791 |
-#if defined(OS_CHROMEOS) |
- return CreateNativeInstance(); |
-#else |
- return new RenderTextHarfBuzz; |
-#endif |
+ return CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableHarfBuzzRenderText) ? CreateNativeInstance() : |
+ new RenderTextHarfBuzz; |
} |
void RenderText::SetText(const base::string16& text) { |