| Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| index 7845ce19688e31c15377d80d6f8f545ca63b21e3..6ee069410ca38671e62ce98cf6a3d48156da43d1 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
|
| @@ -3669,9 +3669,9 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCanScrollForWebMouseWheelEvent) {
|
| GetInputEventFromMessage(*sink_->GetMessageAt(0));
|
| const WebMouseWheelEvent* wheel_event =
|
| static_cast<const WebMouseWheelEvent*>(input_event);
|
| - // Check if the canScroll set to false when ctrl-scroll is generated from
|
| + // Check if scroll is caused when ctrl-scroll is generated from
|
| // mouse wheel event.
|
| - EXPECT_FALSE(wheel_event->canScroll);
|
| + EXPECT_FALSE(WebInputEventTraits::CanCauseScroll(*wheel_event));
|
| sink_->ClearMessages();
|
|
|
| // Ack'ing the outstanding event should flush the pending event queue.
|
| @@ -3686,9 +3686,9 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCanScrollForWebMouseWheelEvent) {
|
|
|
| input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
|
| wheel_event = static_cast<const WebMouseWheelEvent*>(input_event);
|
| - // Check if the canScroll set to true when no modifier is applied to the
|
| + // Check if scroll is caused when no modifier is applied to the
|
| // mouse wheel event.
|
| - EXPECT_TRUE(wheel_event->canScroll);
|
| + EXPECT_TRUE(WebInputEventTraits::CanCauseScroll(*wheel_event));
|
| sink_->ClearMessages();
|
|
|
| SendInputEventACK(blink::WebInputEvent::MouseWheel,
|
| @@ -3701,9 +3701,9 @@ TEST_F(RenderWidgetHostViewAuraTest, SetCanScrollForWebMouseWheelEvent) {
|
|
|
| input_event = GetInputEventFromMessage(*sink_->GetMessageAt(0));
|
| wheel_event = static_cast<const WebMouseWheelEvent*>(input_event);
|
| - // Check if the canScroll set to true when ctrl-touchpad-scroll is generated
|
| + // Check if scroll is caused when ctrl-touchpad-scroll is generated
|
| // from scroll event.
|
| - EXPECT_TRUE(wheel_event->canScroll);
|
| + EXPECT_TRUE(WebInputEventTraits::CanCauseScroll(*wheel_event));
|
| }
|
|
|
| // Ensures that the mapping from ui::TouchEvent to blink::WebTouchEvent doesn't
|
|
|