Index: ui/events/event_unittest.cc |
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc |
index a0b9d162bc5dd6a6490495dd23af861dcef2cad7..6989ac01c6a599997e7b34bc84ad23504565cd32 100644 |
--- a/ui/events/event_unittest.cc |
+++ b/ui/events/event_unittest.cc |
@@ -90,9 +90,9 @@ TEST(EventTest, RepeatedClick) { |
LocatedEventTestApi test_ev1(&mouse_ev1); |
LocatedEventTestApi test_ev2(&mouse_ev2); |
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); |
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); |
- base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000); |
+ base::TimeTicks start = base::TimeTicks(); |
+ base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1); |
+ base::TimeTicks later = start + base::TimeDelta::FromMilliseconds(1000); |
// Same event. |
test_ev1.set_location(gfx::Point(0, 0)); |
@@ -133,8 +133,8 @@ TEST(EventTest, DoubleClickRequiresRelease) { |
const gfx::Point origin1(0, 0); |
const gfx::Point origin2(100, 0); |
std::unique_ptr<MouseEvent> ev; |
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); |
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); |
+ base::TimeTicks start = base::TimeTicks(); |
+ base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1); |
ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(), |
0, 0)); |
@@ -169,8 +169,8 @@ TEST(EventTest, DoubleClickRequiresRelease) { |
TEST(EventTest, SingleClickRightLeft) { |
const gfx::Point origin(0, 0); |
std::unique_ptr<MouseEvent> ev; |
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0); |
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1); |
+ base::TimeTicks start = base::TimeTicks(); |
+ base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1); |
ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), |
ui::EF_RIGHT_MOUSE_BUTTON, |
@@ -568,7 +568,7 @@ TEST(EventTest, AutoRepeat) { |
#endif // USE_X11 || OS_WIN |
TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) { |
- const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0); |
+ const base::TimeTicks time = base::TimeTicks(); |
const float non_zero_length1 = 30; |
const float non_zero_length2 = 46; |
@@ -584,7 +584,7 @@ TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) { |
} |
TEST(EventTest, TouchEventRotationAngleFixing) { |
- const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0); |
+ const base::TimeTicks time = base::TimeTicks(); |
const float radius_x = 20; |
const float radius_y = 10; |
@@ -734,7 +734,7 @@ TEST(EventTest, PointerDetailsCustomTouch) { |
TEST(EventTest, PointerEventCanConvertFrom) { |
const gfx::Point point; |
- const base::TimeDelta time; |
+ const base::TimeTicks time; |
// Common mouse events can be converted. |
const EventType mouse_allowed[] = { |
@@ -796,7 +796,7 @@ TEST(EventTest, PointerEventType) { |
for (size_t i = 0; i < arraysize(kMouseTypeMap); i++) { |
ui::MouseEvent mouse_event(kMouseTypeMap[i][0], gfx::Point(0, 0), |
- gfx::Point(0, 0), base::TimeDelta(), 0, 0); |
+ gfx::Point(0, 0), base::TimeTicks(), 0, 0); |
ui::PointerEvent pointer_event(mouse_event); |
EXPECT_EQ(kMouseTypeMap[i][1], pointer_event.type()); |
EXPECT_FALSE(pointer_event.IsMouseEvent()); |
@@ -806,7 +806,7 @@ TEST(EventTest, PointerEventType) { |
for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) { |
ui::TouchEvent touch_event(kTouchTypeMap[i][0], gfx::Point(0, 0), 0, |
- base::TimeDelta()); |
+ base::TimeTicks()); |
ui::PointerEvent pointer_event(touch_event); |
EXPECT_EQ(kTouchTypeMap[i][1], pointer_event.type()); |
EXPECT_FALSE(pointer_event.IsMouseEvent()); |
@@ -818,14 +818,14 @@ TEST(EventTest, PointerEventType) { |
TEST(EventTest, PointerEventId) { |
{ |
ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), |
- gfx::Point(0, 0), base::TimeDelta(), 0, 0); |
+ gfx::Point(0, 0), base::TimeTicks(), 0, 0); |
ui::PointerEvent pointer_event(mouse_event); |
EXPECT_EQ(pointer_event.pointer_id(), ui::PointerEvent::kMousePointerId); |
} |
for (int touch_id = 0; touch_id < 8; touch_id++) { |
ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), touch_id, |
- base::TimeDelta()); |
+ base::TimeTicks()); |
ui::PointerEvent pointer_event(touch_event); |
EXPECT_EQ(pointer_event.pointer_id(), touch_id); |
} |
@@ -932,7 +932,7 @@ TEST(EventTest, PointerEventToMouseEvent) { |
kTestData[i].in_type, kTestData[i].location, kTestData[i].root_location, |
kTestData[i].flags, 0, |
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE), |
- base::TimeDelta()); |
+ base::TimeTicks()); |
ui::MouseEvent mouse_event(pointer_event); |
EXPECT_EQ(kTestData[i].out_type, mouse_event.type()); |
@@ -954,7 +954,7 @@ TEST(EventTest, PointerEventToTouchEventType) { |
ui::PointerEvent pointer_event( |
kTouchTypeMap[i][0], gfx::Point(), gfx::Point(), 0, 0, |
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH), |
- base::TimeDelta()); |
+ base::TimeTicks()); |
ui::TouchEvent touch_event(pointer_event); |
EXPECT_EQ(kTouchTypeMap[i][1], touch_event.type()); |