Make touch drag drop and touch editing flags tri-state and turn them on by

ui/views/controls/textfield/native_textfield_views.cc

Index: ui/views/controls/textfield/native_textfield_views.cc
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 65a2e6e7ae34cf256eda010270d7ef24c9060efd..75d2ef51450dc6e46ed573200638cd360502047d 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -8,7 +8,6 @@
 #include <set>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
@@ -24,7 +23,7 @@
 #include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/range/range.h"
-#include "ui/base/ui_base_switches.h"
+#include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
@@ -201,8 +200,7 @@ void NativeTextfieldViews::OnGestureEvent(ui::GestureEvent* event) {
         OnAfterUserAction();
         if (touch_selection_controller_.get())
           event->SetHandled();
-      } else if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableTouchDragDrop)) {
+      } else if (switches::IsTouchDragDropEnabled()) {
         touch_selection_controller_.reset();
       } else {
         if (!touch_selection_controller_.get())