1 files changed, 3 insertions, 15 deletions
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc
index 8c516c1..d7a6a55 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) {