Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7596)

Unified Diff: components/exo/pointer_unittest.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/exo/pointer_unittest.cc
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
index 81dec7921fb8b3effe9e1170df4df47339cf5a1a..80416ee82a6a4f9fe5dd1c23ad8e0cbe8a9143a4 100644
--- a/components/exo/pointer_unittest.cc
+++ b/components/exo/pointer_unittest.cc
@@ -28,12 +28,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());
};
@@ -253,7 +253,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();

Powered by Google App Engine
This is Rietveld 408576698