Revert 196479 "Revert 196446 "Make touch drag drop and touch edi..."

trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc

Index: trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc
===================================================================
--- trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc	(revision 196797)
+++ trunk/src/content/browser/web_contents/touch_editable_impl_aura.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "content/browser/web_contents/touch_editable_impl_aura.h"
 
-#include "base/command_line.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/common/view_messages.h"
@@ -16,7 +15,7 @@
 #include "ui/aura/window.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/range/range.h"
-#include "ui/base/ui_base_switches.h"
+#include "ui/base/ui_base_switches_util.h"
 
 namespace content {
 
@@ -29,11 +28,8 @@
 
 // static
 TouchEditableImplAura* TouchEditableImplAura::Create() {
-#if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableTouchEditing))
+  if (switches::IsTouchEditingEnabled())
     return new TouchEditableImplAura();
-#endif
   return NULL;
 }