| Index: content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| index 4409e94170fadebfa9989b6082eaf11b6acb69bf..814eefa7d8e80df8fdbbdd74fe3bd8dc32cb49b3 100644
|
| --- a/content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| +++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
|
| @@ -39,7 +39,6 @@
|
| #include "ui/events/event.h"
|
| #endif
|
|
|
| -using base::TimeDelta;
|
| using blink::WebGestureDevice;
|
| using blink::WebGestureEvent;
|
| using blink::WebKeyboardEvent;
|
| @@ -113,7 +112,7 @@ bool TouchEventsAreEquivalent(const ui::TouchEvent& first,
|
| return false;
|
| if (first.touch_id() != second.touch_id())
|
| return false;
|
| - if (second.time_stamp().InSeconds() != first.time_stamp().InSeconds())
|
| + if (second.time_stamp() != first.time_stamp())
|
| return false;
|
| return true;
|
| }
|
| @@ -265,7 +264,7 @@ class InputRouterImplTest : public testing::Test {
|
| velocity_x, velocity_y, source_device));
|
| }
|
|
|
| - void SetTouchTimestamp(base::TimeDelta timestamp) {
|
| + void SetTouchTimestamp(base::TimeTicks timestamp) {
|
| touch_event_.SetTimestamp(timestamp);
|
| }
|
|
|
| @@ -869,7 +868,7 @@ TEST_F(InputRouterImplTest, AckedTouchEventState) {
|
|
|
| // Use a custom timestamp for all the events to test that the acked events
|
| // have the same timestamp;
|
| - base::TimeDelta timestamp = base::Time::NowFromSystemTime() - base::Time();
|
| + base::TimeTicks timestamp = base::TimeTicks::Now();
|
| timestamp -= base::TimeDelta::FromSeconds(600);
|
|
|
| // Press the first finger.
|
|
|