Revert 205124 "Turn on touch drag and drop and touch editing by ..."

> Turn on touch drag and drop and touch editing by default on chromeos.
> 
> BUG=168162
> 
> Review URL: https://chromiumcodereview.appspot.com/16268020

TBR=varunjain@chromium.org,sky@chromium.org

Review URL: https://codereview.chromium.org/17068008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207820 0039d316-1c4b-4281-b951-d872f2087c98

ui/base/ui_base_switches_util.cc

@@ -10,23 +10,13 @@
 namespace switches {
 
 bool IsTouchDragDropEnabled() {
-#if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTouchDragDrop);
-#else
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchDragDrop);
-#endif
 }
 
 bool IsTouchEditingEnabled() {
-#if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTouchEditing);
-#else
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchEditing);
-#endif
 }
 
 bool IsNewDialogStyleEnabled() {