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

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

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "content/public/browser/render_widget_host.h"
 #include "grit/ui_strings.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
 #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 {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEditableImplAura, public:
 
 TouchEditableImplAura::~TouchEditableImplAura() {
   Cleanup();
 }
 
 // static
 TouchEditableImplAura* TouchEditableImplAura::Create() {
-#if defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableTouchEditing))
+  if (switches::IsTouchEditingEnabled())
     return new TouchEditableImplAura();
-#endif
   return NULL;
 }
 
 void TouchEditableImplAura::AttachToView(RenderWidgetHostViewAura* view) {
   if (rwhva_ == view)
     return;
 
   Cleanup();
   if (!view)
     return;
@@ skipping 258 matching lines @@
 
 void TouchEditableImplAura::Cleanup() {
   if (rwhva_) {
     rwhva_->set_touch_editing_client(NULL);
     rwhva_ = NULL;
   }
   touch_selection_controller_.reset();
 }
 
 }  // namespace content