| Index: ui/views/widget/widget_unittest.cc
|
| diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
|
| index a716fc3559c92c190fc2e597f26ea9cb3c23ff60..8761f7f5cc83857e0164d4f81eb654e02b4c555d 100644
|
| --- a/ui/views/widget/widget_unittest.cc
|
| +++ b/ui/views/widget/widget_unittest.cc
|
| @@ -1495,23 +1495,14 @@ TEST_F(WidgetTest, GestureScrollEventDispatching) {
|
|
|
| {
|
| ui::GestureEvent begin(
|
| - 5,
|
| - 5,
|
| - 0,
|
| - base::TimeDelta(),
|
| + 5, 5, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN));
|
| widget->OnGestureEvent(&begin);
|
| ui::GestureEvent update(
|
| - 25,
|
| - 15,
|
| - 0,
|
| - base::TimeDelta(),
|
| + 25, 15, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_UPDATE, 20, 10));
|
| widget->OnGestureEvent(&update);
|
| - ui::GestureEvent end(25,
|
| - 15,
|
| - 0,
|
| - base::TimeDelta(),
|
| + ui::GestureEvent end(25, 15, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END));
|
| widget->OnGestureEvent(&end);
|
|
|
| @@ -1522,23 +1513,14 @@ TEST_F(WidgetTest, GestureScrollEventDispatching) {
|
|
|
| {
|
| ui::GestureEvent begin(
|
| - 65,
|
| - 5,
|
| - 0,
|
| - base::TimeDelta(),
|
| + 65, 5, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN));
|
| widget->OnGestureEvent(&begin);
|
| ui::GestureEvent update(
|
| - 85,
|
| - 15,
|
| - 0,
|
| - base::TimeDelta(),
|
| + 85, 15, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_UPDATE, 20, 10));
|
| widget->OnGestureEvent(&update);
|
| - ui::GestureEvent end(85,
|
| - 15,
|
| - 0,
|
| - base::TimeDelta(),
|
| + ui::GestureEvent end(85, 15, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END));
|
| widget->OnGestureEvent(&end);
|
|
|
| @@ -2267,10 +2249,7 @@ TEST_F(WidgetTest, MAYBE_DisableTestRootViewHandlersWhenHidden) {
|
| // Check RootView::gesture_handler_.
|
| widget->Show();
|
| EXPECT_EQ(NULL, GetGestureHandler(root_view));
|
| - ui::GestureEvent tap_down(15,
|
| - 15,
|
| - 0,
|
| - base::TimeDelta(),
|
| + ui::GestureEvent tap_down(15, 15, 0, base::TimeTicks(),
|
| ui::GestureEventDetails(ui::ET_GESTURE_TAP_DOWN));
|
| widget->OnGestureEvent(&tap_down);
|
| EXPECT_EQ(view, GetGestureHandler(root_view));
|
| @@ -2287,11 +2266,11 @@ class GestureEventForTest : public ui::GestureEvent {
|
| : GestureEvent(x,
|
| y,
|
| 0,
|
| - base::TimeDelta(),
|
| + base::TimeTicks(),
|
| ui::GestureEventDetails(type)) {}
|
|
|
| GestureEventForTest(ui::GestureEventDetails details, int x, int y)
|
| - : GestureEvent(x, y, 0, base::TimeDelta(), details) {}
|
| + : GestureEvent(x, y, 0, base::TimeTicks(), details) {}
|
| };
|
|
|
| // Tests that the |gesture_handler_| member in RootView is always NULL
|
|
|