| Index: components/exo/pointer_unittest.cc
|
| diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
|
| index 5295388d0506e01e384255605d6c882fababcbf5..28ba40903aa9efea0faf7e4396956ec95e7cae3f 100644
|
| --- a/components/exo/pointer_unittest.cc
|
| +++ b/components/exo/pointer_unittest.cc
|
| @@ -29,12 +29,12 @@ class MockPointerDelegate : public PointerDelegate {
|
| MOCK_CONST_METHOD1(CanAcceptPointerEventsForSurface, bool(Surface*));
|
| MOCK_METHOD3(OnPointerEnter, void(Surface*, const gfx::PointF&, int));
|
| MOCK_METHOD1(OnPointerLeave, void(Surface*));
|
| - MOCK_METHOD2(OnPointerMotion, void(base::TimeDelta, const gfx::PointF&));
|
| - MOCK_METHOD3(OnPointerButton, void(base::TimeDelta, int, bool));
|
| + MOCK_METHOD2(OnPointerMotion, void(base::TimeTicks, const gfx::PointF&));
|
| + MOCK_METHOD3(OnPointerButton, void(base::TimeTicks, int, bool));
|
| MOCK_METHOD3(OnPointerScroll,
|
| - void(base::TimeDelta, const gfx::Vector2dF&, bool));
|
| - MOCK_METHOD1(OnPointerScrollCancel, void(base::TimeDelta));
|
| - MOCK_METHOD1(OnPointerScrollStop, void(base::TimeDelta));
|
| + void(base::TimeTicks, const gfx::Vector2dF&, bool));
|
| + MOCK_METHOD1(OnPointerScrollCancel, void(base::TimeTicks));
|
| + MOCK_METHOD1(OnPointerScrollStop, void(base::TimeTicks));
|
| MOCK_METHOD0(OnPointerFrame, void());
|
| };
|
|
|
| @@ -255,7 +255,7 @@ TEST_F(PointerTest, OnPointerScroll) {
|
| OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false));
|
| EXPECT_CALL(delegate, OnPointerScrollStop(testing::_));
|
| }
|
| - generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
|
| + generator.ScrollSequence(location, base::TimeTicks(), 1, 1, 1, 1);
|
|
|
| EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
|
| pointer.reset();
|
|
|