Make touch-based synthetic gesture take touch slop into account.

content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

Index: content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
index baefa695d1338af6557bd5b28f498b5aee0b23ac..7118e5120d95f19e19ac39eda9f86089557eb538 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
+++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
@@ -25,6 +25,7 @@ namespace {
 
 const int kFlushInputRateInMs = 16;
 const int kPointerAssumedStoppedTimeMs = 43;
+const int kTouchSlopInDips = 7;
 
 class MockSyntheticGesture : public SyntheticGesture {
  public:
@@ -100,6 +101,10 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget {
     pointer_assumed_stopped_time_ms_ = time_ms;
   }
 
+  virtual int GetTouchSlopInDips() const OVERRIDE {
+    return kTouchSlopInDips;
+  }
+
   int num_success() const { return num_success_; }
   int num_failure() const { return num_failure_; }
 
@@ -373,7 +378,7 @@ TEST_F(SyntheticGestureControllerTest, SmoothScrollGestureTouch) {
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
-  EXPECT_FLOAT_EQ(params.distance,
+  EXPECT_FLOAT_EQ(params.distance + target_->GetTouchSlopInDips(),
                   static_cast<MockSyntheticSmoothScrollTouchTarget*>(target_)
                       ->scroll_distance());
 }
@@ -397,7 +402,7 @@ TEST_F(SyntheticGestureControllerTest, SmoothScrollGestureTouchLongStop) {
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
-  EXPECT_FLOAT_EQ(params.distance,
+  EXPECT_FLOAT_EQ(params.distance + target_->GetTouchSlopInDips(),
                   static_cast<MockSyntheticSmoothScrollTouchTarget*>(target_)
                       ->scroll_distance());
   EXPECT_GE(GetTotalTime(), target_->PointerAssumedStoppedTime());
@@ -439,9 +444,10 @@ TEST_F(SyntheticGestureControllerTest, PinchGestureTouchZoomIn) {
   EXPECT_EQ(
       static_cast<MockSyntheticPinchTouchTarget*>(target_)->zoom_direction(),
       MockSyntheticPinchTouchTarget::ZOOM_IN);
-  EXPECT_FLOAT_EQ(params.total_num_pixels_covered,
-                  static_cast<MockSyntheticPinchTouchTarget*>(target_)
-                      ->total_num_pixels_covered());
+  EXPECT_FLOAT_EQ(
+      params.total_num_pixels_covered + 2 * target_->GetTouchSlopInDips(),
+      static_cast<MockSyntheticPinchTouchTarget*>(target_)
+          ->total_num_pixels_covered());
 }
 
 TEST_F(SyntheticGestureControllerTest, PinchGestureTouchZoomOut) {
@@ -461,9 +467,10 @@ TEST_F(SyntheticGestureControllerTest, PinchGestureTouchZoomOut) {
   EXPECT_EQ(
       static_cast<MockSyntheticPinchTouchTarget*>(target_)->zoom_direction(),
       MockSyntheticPinchTouchTarget::ZOOM_OUT);
-  EXPECT_FLOAT_EQ(params.total_num_pixels_covered,
-                  static_cast<MockSyntheticPinchTouchTarget*>(target_)
-                      ->total_num_pixels_covered());
+  EXPECT_FLOAT_EQ(
+      params.total_num_pixels_covered + 2 * target_->GetTouchSlopInDips(),
+      static_cast<MockSyntheticPinchTouchTarget*>(target_)
+          ->total_num_pixels_covered());
 }
 
 }  // namespace