Revert of Don't treat first touch move differently from future touch moves

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 0b4afa874f662488b288ef0e43c8b247f1e745af..596cb1f40cbdb23baf0122488e507d6d846cb808 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -2098,8 +2098,7 @@
 }
 
 TEST_P(GestureRecognizerTest, GestureEventPinchFromTap) {
-  // Disabled under unified gesture recognizer due to behavior differences in
-  // scroll and bounding box behavior.
+  // TODO(tdresser): enable this test with unified GR once two finger tap.
   if (UsingUnifiedGR())
     return;
 
@@ -3145,15 +3144,9 @@
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_TRUE(delegate->tap_cancel());
   EXPECT_FALSE(delegate->begin());
+  EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
-
-  // With the unified gesture detector, consuming the first touch move event
-  // won't prevent all future scrolling.
-  if (UsingUnifiedGR())
-    EXPECT_TRUE(delegate->scroll_begin());
-  else
-    EXPECT_FALSE(delegate->scroll_begin());
 
   // Release the touch back at the start point. This should end without causing
   // a tap.
@@ -3168,11 +3161,7 @@
   EXPECT_TRUE(delegate->end());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
-
-  if (UsingUnifiedGR())
-    EXPECT_TRUE(delegate->scroll_end());
-  else
-    EXPECT_FALSE(delegate->scroll_end());
+  EXPECT_FALSE(delegate->scroll_end());
 }
 
 // Tests the behavior of 2F scroll when all the touch-move events are consumed.
@@ -3319,15 +3308,9 @@
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_TRUE(delegate->tap_cancel());
   EXPECT_FALSE(delegate->begin());
+  EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
-
-  // With the unified gesture detector, consuming the first touch move event
-  // won't prevent all future scrolling.
-  if (UsingUnifiedGR())
-    EXPECT_TRUE(delegate->scroll_begin());
-  else
-    EXPECT_FALSE(delegate->scroll_begin());
 
   // Now, stop consuming touch-move events, and move the touch-point again.
   delegate->set_consume_touch_move(false);
@@ -3337,23 +3320,13 @@
   EXPECT_FALSE(delegate->tap_cancel());
   EXPECT_FALSE(delegate->begin());
   EXPECT_FALSE(delegate->scroll_begin());
+  EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
-
-  if (UsingUnifiedGR()) {
-    // Scroll not prevented by consumed first touch move.
-    EXPECT_TRUE(delegate->scroll_update());
-    EXPECT_EQ(29, delegate->scroll_x());
-    EXPECT_EQ(29, delegate->scroll_y());
-    EXPECT_EQ(gfx::Point(0, 0).ToString(),
-              delegate->scroll_begin_position().ToString());
-  } else {
-    EXPECT_FALSE(delegate->scroll_update());
-    // No scroll has occurred, because an early touch move was consumed.
-    EXPECT_EQ(0, delegate->scroll_x());
-    EXPECT_EQ(0, delegate->scroll_y());
-    EXPECT_EQ(gfx::Point(0, 0).ToString(),
-              delegate->scroll_begin_position().ToString());
-  }
+  // No scroll has occurred, because an early touch move was consumed.
+  EXPECT_EQ(0, delegate->scroll_x());
+  EXPECT_EQ(0, delegate->scroll_y());
+  EXPECT_EQ(gfx::Point(0, 0).ToString(),
+            delegate->scroll_begin_position().ToString());
 
   // Start consuming touch-move events again.
   delegate->set_consume_touch_move(true);
@@ -3393,12 +3366,8 @@
   EXPECT_TRUE(delegate->end());
   EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
+  EXPECT_FALSE(delegate->scroll_end());
   EXPECT_FALSE(delegate->fling());
-
-  if (UsingUnifiedGR())
-    EXPECT_TRUE(delegate->scroll_end());
-  else
-    EXPECT_FALSE(delegate->scroll_end());
 }
 
 // Check that appropriate touch events generate double tap gesture events.
@@ -3736,15 +3705,14 @@
   delegate->set_consume_touch_move(true);
   delegate->Reset();
   // Move the touch-point enough so that it would normally be considered a
-  // scroll. But since the touch-moves will be consumed, no scrolling should
-  // occur.
-  // With the unified gesture detector, we will receive a scroll begin gesture,
-  // whereas with the aura gesture recognizer we won't.
+  // scroll. But since the touch-moves will be consumed, the scroll should not
+  // start.
   tes.SendScrollEvent(event_processor(), 130, 230, kTouchId, delegate.get());
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->tap_down());
   EXPECT_TRUE(delegate->tap_cancel());
   EXPECT_FALSE(delegate->begin());
+  EXPECT_FALSE(delegate->scroll_begin());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->scroll_end());
 }
@@ -3943,15 +3911,8 @@
   DispatchEventUsingWindowDispatcher(&move2);
   delegate->ReceivedAck();
 
-  if (UsingUnifiedGR()) {
-    // With the unified gesture detector, consuming the first touch move event
-    // won't prevent all future scrolling.
-    EXPECT_TRUE(delegate->scroll_begin());
-    EXPECT_TRUE(delegate->scroll_update());
-  } else {
-    EXPECT_FALSE(delegate->scroll_begin());
-    EXPECT_FALSE(delegate->scroll_update());
-  }
+  EXPECT_FALSE(delegate->scroll_begin());
+  EXPECT_FALSE(delegate->scroll_update());
 }
 
 // Test that consuming the first touch move event of a touch point doesn't