| Index: ui/base/user_activity/user_activity_detector_unittest.cc
|
| diff --git a/ui/base/user_activity/user_activity_detector_unittest.cc b/ui/base/user_activity/user_activity_detector_unittest.cc
|
| index c8949ab10e943c492f65df3e13e16e4a52b4e50c..5bcc7a9000ad794f5da09feb52afc53b4282aa60 100644
|
| --- a/ui/base/user_activity/user_activity_detector_unittest.cc
|
| +++ b/ui/base/user_activity/user_activity_detector_unittest.cc
|
| @@ -141,8 +141,8 @@ TEST_F(UserActivityDetectorTest, Basic) {
|
| observer_->reset_stats();
|
|
|
| AdvanceTime(advance_delta);
|
| - ui::TouchEvent touch_event(
|
| - ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta());
|
| + ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(), 0,
|
| + base::TimeTicks());
|
| OnEvent(&touch_event);
|
| EXPECT_FALSE(touch_event.handled());
|
| EXPECT_EQ(now_.ToInternalValue(),
|
| @@ -151,12 +151,8 @@ TEST_F(UserActivityDetectorTest, Basic) {
|
| observer_->reset_stats();
|
|
|
| AdvanceTime(advance_delta);
|
| - ui::GestureEvent gesture_event(
|
| - 0,
|
| - 0,
|
| - ui::EF_NONE,
|
| - base::TimeDelta::FromMilliseconds(base::Time::Now().ToDoubleT() * 1000),
|
| - ui::GestureEventDetails(ui::ET_GESTURE_TAP));
|
| + ui::GestureEvent gesture_event(0, 0, ui::EF_NONE, base::TimeTicks::Now(),
|
| + ui::GestureEventDetails(ui::ET_GESTURE_TAP));
|
| OnEvent(&gesture_event);
|
| EXPECT_FALSE(gesture_event.handled());
|
| EXPECT_EQ(now_.ToInternalValue(),
|
|
|