| Index: ui/events/blink/input_handler_proxy_unittest.cc
|
| diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc
|
| index 28a95d7df73c74bfefae01ddbabf96cc545b098f..90f535d10d9c833d2e50086eb9b669c00b255ad8 100644
|
| --- a/ui/events/blink/input_handler_proxy_unittest.cc
|
| +++ b/ui/events/blink/input_handler_proxy_unittest.cc
|
| @@ -1707,11 +1707,10 @@ TEST_P(InputHandlerProxyTest, GestureFlingStopsAtContentEdge) {
|
| .WillOnce(testing::Return(overscroll));
|
| EXPECT_CALL(
|
| mock_client_,
|
| - DidOverscroll(
|
| - overscroll.accumulated_root_overscroll,
|
| - overscroll.unused_scroll_delta,
|
| - testing::Property(&gfx::Vector2dF::y, testing::Lt(0)),
|
| - testing::_));
|
| + DidOverscroll(overscroll.accumulated_root_overscroll,
|
| + overscroll.unused_scroll_delta,
|
| + testing::Property(&gfx::Vector2dF::y, testing::Lt(0)),
|
| + testing::_));
|
| EXPECT_CALL(mock_input_handler_, ScrollEnd(testing::_));
|
| EXPECT_SET_NEEDS_ANIMATE_INPUT(1);
|
| time += base::TimeDelta::FromMilliseconds(100);
|
| @@ -1865,11 +1864,10 @@ TEST_P(InputHandlerProxyTest, GestureFlingCancelledAfterBothAxesStopScrolling) {
|
| .WillOnce(testing::Return(overscroll));
|
| EXPECT_CALL(
|
| mock_client_,
|
| - DidOverscroll(
|
| - overscroll.accumulated_root_overscroll,
|
| - overscroll.unused_scroll_delta,
|
| - testing::Property(&gfx::Vector2dF::y, testing::Lt(0)),
|
| - testing::_));
|
| + DidOverscroll(overscroll.accumulated_root_overscroll,
|
| + overscroll.unused_scroll_delta,
|
| + testing::Property(&gfx::Vector2dF::y, testing::Lt(0)),
|
| + testing::_));
|
| EXPECT_SET_NEEDS_ANIMATE_INPUT(1);
|
| time += base::TimeDelta::FromMilliseconds(10);
|
| Animate(time);
|
| @@ -1894,11 +1892,10 @@ TEST_P(InputHandlerProxyTest, GestureFlingCancelledAfterBothAxesStopScrolling) {
|
| .WillOnce(testing::Return(overscroll));
|
| EXPECT_CALL(
|
| mock_client_,
|
| - DidOverscroll(
|
| - overscroll.accumulated_root_overscroll,
|
| - overscroll.unused_scroll_delta,
|
| - testing::Property(&gfx::Vector2dF::x, testing::Lt(0)),
|
| - testing::_));
|
| + DidOverscroll(overscroll.accumulated_root_overscroll,
|
| + overscroll.unused_scroll_delta,
|
| + testing::Property(&gfx::Vector2dF::x, testing::Lt(0)),
|
| + testing::_));
|
| EXPECT_CALL(mock_input_handler_, ScrollEnd(testing::_));
|
| time += base::TimeDelta::FromMilliseconds(10);
|
| Animate(time);
|
|
|