Remove canScroll from WebMouseWheelEvent as it is unused now.

content/common/input/web_input_event_traits_unittest.cc

 // Copyright 2014 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/common/input/web_input_event_traits.h"
 
 #include <limits>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
@@ skipping 34 matching lines @@
   static WebGestureEvent CreateGesture(WebInputEvent::Type type,
                                        float x,
                                        float y) {
     WebGestureEvent event;
     event.type = type;
     event.x = x;
     event.y = y;
     return event;
   }
 
-  static WebMouseWheelEvent CreateMouseWheel(float deltaX,
-                                             float deltaY,
-                                             bool canScroll) {
+  static WebMouseWheelEvent CreateMouseWheel(float deltaX, float deltaY) {
     WebMouseWheelEvent event;
     event.type = WebInputEvent::MouseWheel;
     event.deltaX = deltaX;
     event.deltaY = deltaY;
-    event.canScroll = canScroll;
     return event;
   }
 };
 
 TEST_F(WebInputEventTraitsTest, TouchEventCoalescing) {
   WebTouchEvent touch0 = CreateTouch(WebInputEvent::TouchStart);
   WebTouchEvent touch1 = CreateTouch(WebInputEvent::TouchMove);
 
   // Non touch-moves won't coalesce.
   EXPECT_FALSE(WebInputEventTraits::CanCoalesce(touch0, touch0));
@@ skipping 122 matching lines @@
   pinch0 = CreateGesture(WebInputEvent::GesturePinchUpdate, 1, 1);
   pinch0.data.pinchUpdate.scale = numeric_limits<float>::max() / 2.0f;
   pinch1 = CreateGesture(WebInputEvent::GesturePinchUpdate, 1, 1);
   pinch1.data.pinchUpdate.scale = 10.0f;
   EXPECT_TRUE(WebInputEventTraits::CanCoalesce(pinch0, pinch1));
   WebInputEventTraits::Coalesce(pinch0, &pinch1);
   EXPECT_EQ(numeric_limits<float>::max(), pinch1.data.pinchUpdate.scale);
 }
 
 TEST_F(WebInputEventTraitsTest, WebMouseWheelEventCoalescing) {
-  WebMouseWheelEvent mouse_wheel_0 =
-      CreateMouseWheel(1, 1, true);
-  WebMouseWheelEvent mouse_wheel_1 =
-      CreateMouseWheel(2, 2, true);
+  WebMouseWheelEvent mouse_wheel_0 = CreateMouseWheel(1, 1);
+  WebMouseWheelEvent mouse_wheel_1 = CreateMouseWheel(2, 2);
 
   // WebMouseWheelEvent objects with same values except different deltaX and
   // deltaY should coalesce.
   EXPECT_TRUE(WebInputEventTraits::CanCoalesce(mouse_wheel_0, mouse_wheel_1));
 
-  mouse_wheel_0 = CreateMouseWheel(1, 1, true);
-  mouse_wheel_1 = CreateMouseWheel(1, 1, false);
-
-  // WebMouseWheelEvent objects with different canScroll values should not
-  // coalesce.
-  EXPECT_FALSE(WebInputEventTraits::CanCoalesce(mouse_wheel_0, mouse_wheel_1));
-
   // WebMouseWheelEvent objects with different modifiers should not coalesce.
-  mouse_wheel_0 = CreateMouseWheel(1, 1, true);
-  mouse_wheel_1 = CreateMouseWheel(1, 1, true);
+  mouse_wheel_0 = CreateMouseWheel(1, 1);
+  mouse_wheel_1 = CreateMouseWheel(1, 1);
   mouse_wheel_0.modifiers = blink::WebInputEvent::ControlKey;
   mouse_wheel_1.modifiers = blink::WebInputEvent::ShiftKey;
   EXPECT_FALSE(WebInputEventTraits::CanCoalesce(mouse_wheel_0, mouse_wheel_1));
 }
 
 // Coalescing preserves the newer timestamp.
 TEST_F(WebInputEventTraitsTest, TimestampCoalescing) {
-  WebMouseWheelEvent mouse_wheel_0 = CreateMouseWheel(1, 1, true);
+  WebMouseWheelEvent mouse_wheel_0 = CreateMouseWheel(1, 1);
   mouse_wheel_0.timeStampSeconds = 5.0;
-  WebMouseWheelEvent mouse_wheel_1 = CreateMouseWheel(2, 2, true);
+  WebMouseWheelEvent mouse_wheel_1 = CreateMouseWheel(2, 2);
   mouse_wheel_1.timeStampSeconds = 10.0;
 
   EXPECT_TRUE(WebInputEventTraits::CanCoalesce(mouse_wheel_0, mouse_wheel_1));
   WebInputEventTraits::Coalesce(mouse_wheel_1, &mouse_wheel_0);
   EXPECT_EQ(10.0, mouse_wheel_0.timeStampSeconds);
 }
 
 // Very basic smoke test to ensure stringification doesn't explode.
 TEST_F(WebInputEventTraitsTest, ToString) {
   WebKeyboardEvent key;
@@ skipping 11 matching lines @@
   WebGestureEvent gesture =
       CreateGesture(WebInputEvent::GesturePinchBegin, 1, 1);
   EXPECT_FALSE(WebInputEventTraits::ToString(gesture).empty());
 
   WebTouchEvent touch = CreateTouch(WebInputEvent::TouchStart);
   EXPECT_FALSE(WebInputEventTraits::ToString(touch).empty());
 }
 
 }  // namespace
 }  // namespace content