Index: components/mus/common/event_param_traits_unittest.cc |
diff --git a/components/mus/common/event_param_traits_unittest.cc b/components/mus/common/event_param_traits_unittest.cc |
index 7c4c8316b7e49f318ffed265b6b2b3f534fd7869..2d116170c3f634dc60e2de0b10d0fe08695e42e6 100644 |
--- a/components/mus/common/event_param_traits_unittest.cc |
+++ b/components/mus/common/event_param_traits_unittest.cc |
@@ -305,7 +305,7 @@ TEST_F(EventParamTraitsTest, GoodSimpleMouseEvent) { |
}; |
for (int i = 0; i < 7; i++) { |
ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(), gfx::Point(), |
- base::TimeDelta(), 0, 0)); |
+ base::TimeTicks(), 0, 0)); |
Verify(event); |
} |
} |
@@ -320,21 +320,21 @@ TEST_F(EventParamTraitsTest, GoodCornerCaseMouseEvent) { |
for (int i = 0; i < 7; i++) { |
ScopedEvent event(new MouseEvent(event_types[i], gfx::Point(IMIN, IMIN), |
gfx::Point(IMAX, IMAX), |
- base::TimeDelta::Max(), IMIN, IMAX)); |
+ base::TimeTicks::Max(), IMIN, IMAX)); |
Verify(event); |
} |
} |
TEST_F(EventParamTraitsTest, GoodSimpleMouseWheelEvent) { |
ScopedEvent event(new MouseWheelEvent(gfx::Vector2d(), gfx::Point(), |
- gfx::Point(), base::TimeDelta(), 0, 0)); |
+ gfx::Point(), base::TimeTicks(), 0, 0)); |
Verify(event); |
} |
TEST_F(EventParamTraitsTest, GoodCornerCaseMouseWheelEvent) { |
ScopedEvent event(new MouseWheelEvent( |
gfx::Vector2d(IMIN, IMAX), gfx::Point(IMIN, IMIN), gfx::Point(IMAX, IMAX), |
- base::TimeDelta::Max(), IMIN, IMAX)); |
+ base::TimeTicks::Max(), IMIN, IMAX)); |
Verify(event); |
} |
@@ -346,7 +346,7 @@ TEST_F(EventParamTraitsTest, GoodSimpleTouchEvent) { |
}; |
for (int i = 0; i < 5; i++) { |
ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(), 0, 0, |
- base::TimeDelta(), 0.0, 0.0, 0.0, 0.0)); |
+ base::TimeTicks(), 0.0, 0.0, 0.0, 0.0)); |
Verify(event); |
} |
} |
@@ -359,7 +359,7 @@ TEST_F(EventParamTraitsTest, GoodCornerCaseTouchEvent) { |
}; |
for (int i = 0; i < 5; i++) { |
ScopedEvent event(new TouchEvent(event_types[i], gfx::Point(IMIN, IMAX), |
- IMIN, IMAX, base::TimeDelta::Max(), FMIN, |
+ IMIN, IMAX, base::TimeTicks::Max(), FMIN, |
FMAX, FNAN, FNAN)); |
Verify(event); |
} |
@@ -372,7 +372,7 @@ TEST_F(EventParamTraitsTest, GoodSimpleKeyEvent) { |
for (int i = 0; i < 2; i++) { |
ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_UNKNOWN, |
static_cast<DomCode>(0), 0, DomKey(0), |
- base::TimeDelta())); |
+ base::TimeTicks())); |
Verify(event); |
} |
} |
@@ -384,21 +384,21 @@ TEST_F(EventParamTraitsTest, GoodCornerCaseKeyEvent) { |
for (int i = 0; i < 2; i++) { |
ScopedEvent event(new KeyEvent(event_types[i], KeyboardCode::VKEY_OEM_CLEAR, |
static_cast<DomCode>(0x0c028c), IMIN, |
- MIN(DomKey), base::TimeDelta::Max())); |
+ MIN(DomKey), base::TimeTicks::Max())); |
Verify(event); |
} |
} |
TEST_F(EventParamTraitsTest, GoodSimpleScrollEvent) { |
ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(), |
- base::TimeDelta(), 0, 0.0, 0.0, 0.0, 0.0, |
+ base::TimeTicks(), 0, 0.0, 0.0, 0.0, 0.0, |
0)); |
Verify(event); |
} |
TEST_F(EventParamTraitsTest, GoodCornerCaseScrollEvent) { |
ScopedEvent event(new ScrollEvent(EventType::ET_SCROLL, gfx::Point(), |
- base::TimeDelta(), IMIN, FMIN, FMAX, FNAN, |
+ base::TimeTicks(), IMIN, FMIN, FMAX, FNAN, |
FMIN, IMAX)); |
Verify(event); |
} |
@@ -426,7 +426,7 @@ TEST_F(EventParamTraitsTest, GoodSimpleGestureEvent) { |
EventType::ET_GESTURE_DOUBLE_TAP, |
}; |
for (int i = 0; i < 19; i++) { |
- ScopedEvent event(new GestureEvent(0.0, 0.0, 0, base::TimeDelta(), |
+ ScopedEvent event(new GestureEvent(0.0, 0.0, 0, base::TimeTicks(), |
GestureEventDetails(event_types[i]))); |
Verify(event); |
} |
@@ -454,7 +454,7 @@ TEST_F(EventParamTraitsTest, GoodCornerCaseGestureEvent) { |
}; |
for (int i = 0; i < 17; i++) { |
ScopedEvent event( |
- new GestureEvent(0.0, 0.0, 0, base::TimeDelta(), |
+ new GestureEvent(0.0, 0.0, 0, base::TimeTicks(), |
CreateCornerCaseGestureEventDetails(event_types[i]))); |
Verify(event); |
} |
@@ -474,7 +474,7 @@ TEST_F(EventParamTraitsTest, GoodSimplePointerEvent) { |
for (size_t j = 0; j < arraysize(pointer_types); j++) { |
ScopedEvent event(new PointerEvent(event_types[i], pointer_types[j], |
gfx::Point(), gfx::Point(), 0, 0, |
- base::TimeDelta())); |
+ base::TimeTicks())); |
Verify(event); |
} |
} |