Create MouseWheelEvent directly instead of through MouseEvent.

ash/wm/immersive_fullscreen_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shared/immersive_fullscreen_controller.h"
 
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/display_manager.h"
@@ skipping 321 matching lines @@
   lock2.reset(controller()->GetRevealedLock(
       ImmersiveFullscreenController::ANIMATE_REVEAL_NO));
   lock1.reset();
   EXPECT_TRUE(controller()->IsRevealed());
 
   lock2.reset();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // 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());
   ASSERT_FALSE(controller()->IsRevealed());
 
   ui::test::EventGenerator& event_generator(GetEventGenerator());
 
   gfx::Rect top_container_bounds_in_screen =
       top_container()->GetBoundsInScreen();
   // A position along the top edge of TopContainerView in screen coordinates.
   gfx::Point top_edge_pos(top_container_bounds_in_screen.x() + 100,
                           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());
 
   // Move to top edge of screen starts hover timer running. We cannot use
   // MoveMouse() because MoveMouse() stops the timer if it started running.
   event_generator.MoveMouseTo(top_edge_pos);
   EXPECT_TRUE(top_edge_hover_timer_running());
   EXPECT_EQ(top_edge_pos.x(), mouse_x_when_hit_top());
 
   // Moving |ImmersiveFullscreenControllerTest::kMouseRevealBoundsHeight| down
@@ skipping 679 matching lines @@
   SetEnabled(true);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
 }
 
 }  // namespase ash