Use multi-value switch to enable/disable the unified gesture detector.

ui/aura/gestures/gesture_recognizer_unittest.cc

Index: ui/aura/gestures/gesture_recognizer_unittest.cc
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index 39be275e273145507341f5b5ddf3dd3d2fa407b0..7de0a23065530cb47158412b97d5f92fa2b688b9 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -681,10 +681,10 @@ class GestureRecognizerTest : public AuraTestBase,
 
   virtual void SetUp() OVERRIDE {
     // TODO(tdresser): Once unified GR has landed, only run these tests once.
-    if (UsingUnifiedGR()) {
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          switches::kUseUnifiedGestureDetector);
-    }
+    CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+        switches::kUnifiedGestureDetector,
+        UsingUnifiedGR() ? switches::kUnifiedGestureDetectorEnabled
+                         : switches::kUnifiedGestureDetectorDisabled);
 
     AuraTestBase::SetUp();
   }