From 2a19c63448c84c1805fb1a585c3651318bb86ca7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 28 Aug 2018 15:28:34 +0200 Subject: BASELINE: Update Chromium to 69.0.3497.70 Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/events/event_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chromium/ui/events/event_unittest.cc') diff --git a/chromium/ui/events/event_unittest.cc b/chromium/ui/events/event_unittest.cc index df23e1b0f20..2f36ae23ae8 100644 --- a/chromium/ui/events/event_unittest.cc +++ b/chromium/ui/events/event_unittest.cc @@ -10,7 +10,7 @@ #include #include "base/macros.h" -#include "base/test/histogram_tester.h" +#include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" @@ -918,7 +918,7 @@ TEST(EventTest, MouseEventLatencyUIComponentExists) { const gfx::Point origin(0, 0); MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0); EXPECT_TRUE(mouseev.latency()->FindLatency( - ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, nullptr)); + ui::INPUT_EVENT_LATENCY_UI_COMPONENT, nullptr)); } TEST(EventTest, MouseWheelEventLatencyUIComponentExists) { @@ -926,7 +926,7 @@ TEST(EventTest, MouseWheelEventLatencyUIComponentExists) { MouseWheelEvent mouseWheelev(gfx::Vector2d(), origin, origin, EventTimeForNow(), 0, 0); EXPECT_TRUE(mouseWheelev.latency()->FindLatency( - ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, nullptr)); + ui::INPUT_EVENT_LATENCY_UI_COMPONENT, nullptr)); } TEST(EventTest, PointerEventToMouseEvent) { -- cgit v1.2.1