Index: ui/aura/gestures/gesture_recognizer_unittest.cc |
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc |
index eaffd6b6616a3c40b3b7162cb2314ab424fd76ca..7cc703ad66f7fb21adb1f4c451c7e3110de2eb85 100644 |
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc |
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc |
@@ -489,19 +489,19 @@ class TimedEvents { |
TimedEvents() : simulated_now_(1) { |
} |
- base::TimeDelta Now() { |
- base::TimeDelta t = base::TimeDelta::FromMilliseconds(simulated_now_); |
+ base::TimeTicks Now() { |
+ base::TimeTicks t = base::TimeTicks::FromInternalValue(simulated_now_); |
simulated_now_++; |
return t; |
} |
- base::TimeDelta LeapForward(int time_in_millis) { |
+ base::TimeTicks LeapForward(int time_in_millis) { |
simulated_now_ += time_in_millis; |
- return base::TimeDelta::FromMilliseconds(simulated_now_); |
+ return base::TimeTicks::FromInternalValue(simulated_now_); |
} |
- base::TimeDelta InFuture(int time_in_millis) { |
- return base::TimeDelta::FromMilliseconds(simulated_now_ + time_in_millis); |
+ base::TimeTicks InFuture(int time_in_millis) { |
+ return base::TimeTicks::FromInternalValue(simulated_now_ + time_in_millis); |
} |
void SendScrollEvents(ui::EventProcessor* dispatcher, |
@@ -520,7 +520,7 @@ class TimedEvents { |
x += dx; |
y += dy; |
ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(x, y), touch_id, |
- base::TimeDelta::FromMilliseconds(simulated_now_)); |
+ base::TimeTicks::FromInternalValue(simulated_now_)); |
ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move); |
ASSERT_FALSE(details.dispatcher_destroyed); |
simulated_now_ += time_step; |
@@ -534,7 +534,7 @@ class TimedEvents { |
GestureEventConsumeDelegate* delegate) { |
delegate->Reset(); |
ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(), touch_id, |
- base::TimeDelta::FromMilliseconds(simulated_now_)); |
+ base::TimeTicks::FromInternalValue(simulated_now_)); |
move.set_location_f(gfx::PointF(x, y)); |
move.set_root_location_f(gfx::PointF(x, y)); |
ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&move); |