2 files changed, 6 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 53976d2..4fdd872 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -820,6 +820,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSessionStorage,
     switches::kDisableSharedWorkers,
     switches::kDisableSpeechInput,
+    switches::kDisableTouchDragDrop,
+    switches::kDisableTouchEditing,
 #if defined(OS_ANDROID)
     switches::kEnableWebAudio,
     switches::kDisableWebRTC,
@@ -843,6 +845,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableGpuBenchmarking,
     switches::kEnableMemoryBenchmarking,
     switches::kEnableLogging,
+    switches::kEnableTouchDragDrop,
+    switches::kEnableTouchEditing,
     switches::kEnableVsyncNotification,
     switches::kEnableWebPInAcceptHeader,
     switches::kDisableMediaSource,
@@ -870,8 +874,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
     switches::kEnableHighDpiCompositingForFixedPosition,
     switches::kDisableCompositingForFixedPosition,
     switches::kEnableAcceleratedPainting,
-    switches::kEnableTouchDragDrop,
-    switches::kEnableTouchEditing,
     switches::kDisableThreadedCompositing,
     switches::kDisableTouchAdjustment,
     switches::kDefaultTileWidth,
diff --git a/content/browser/web_contents/touch_editable_impl_aura.cc b/content/browser/web_contents/touch_editable_impl_aura.cc
index d6b3ed9..d782b8c 100644
--- a/content/browser/web_contents/touch_editable_impl_aura.cc
+++ b/content/browser/web_contents/touch_editable_impl_aura.cc
@@ -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 @@ TouchEditableImplAura::~TouchEditableImplAura() {
 
 // static
 TouchEditableImplAura* TouchEditableImplAura::Create() {
-#if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableTouchEditing))
+  if (switches::IsTouchEditingEnabled())
     return new TouchEditableImplAura();
-#endif
   return NULL;
 }