Reland https://chromiumcodereview.appspot.com/14286004 which was reverted fue

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6f1b764f5eaba05664aa4c254707fbb66d410ece..c8e67ec4925ce99759c244d865208c976d3fac95 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -181,7 +181,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWindowFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/default/WebRenderTheme.h"
-#include "ui/base/ui_base_switches.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
@@ -746,10 +746,10 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) {
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
 
-  if (command_line.HasSwitch(switches::kEnableTouchDragDrop))
+  if (switches::IsTouchDragDropEnabled())
     webview()->settings()->setTouchDragDropEnabled(true);
 
-  if (command_line.HasSwitch(switches::kEnableTouchEditing))
+  if (switches::IsTouchEditingEnabled())
     webview()->settings()->setTouchEditingEnabled(true);
 
   if (!params->frame_name.empty())