Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1800)

Unified Diff: ash/wm/immersive_fullscreen_controller_unittest.cc

Issue 2287403002: Create MouseWheelEvent directly instead of through MouseEvent. (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/events/event.h » ('j') | ui/events/event.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/immersive_fullscreen_controller_unittest.cc
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index 9bd748aca98c63500e871037f47c3f9ac0e68566..ec148e808948934472f23809b971588a9fd393c0 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -339,13 +339,7 @@ TEST_F(ImmersiveFullscreenControllerTest, RevealedLock) {
}
// Test mouse event processing for top-of-screen reveal triggering.
-// TODO: ASan failure happens on ChromeOS (https://crbug.com/641828).
-#if defined(OS_CHROMEOS)
-#define MAYBE_OnMouseEvent DISABLED_OnMouseEvent
-#else
-#define MAYBE_OnMouseEvent OnMouseEvent
-#endif
-TEST_F(ImmersiveFullscreenControllerTest, MAYBE_OnMouseEvent) {
+TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
// Set up initial state.
SetEnabled(true);
ASSERT_TRUE(controller()->IsEnabled());
@@ -360,8 +354,8 @@ TEST_F(ImmersiveFullscreenControllerTest, MAYBE_OnMouseEvent) {
top_container_bounds_in_screen.y());
// Mouse wheel event does nothing.
- ui::MouseEvent wheel(ui::ET_MOUSEWHEEL, top_edge_pos, top_edge_pos,
- ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+ ui::MouseWheelEvent wheel(gfx::Vector2d(), top_edge_pos, top_edge_pos,
+ ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
event_generator.Dispatch(&wheel);
EXPECT_FALSE(top_edge_hover_timer_running());
« no previous file with comments | « no previous file | ui/events/event.h » ('j') | ui/events/event.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698