Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."

trunk/src/ash/wm/resize_shadow_and_cursor_unittest.cc

Index: trunk/src/ash/wm/resize_shadow_and_cursor_unittest.cc
===================================================================
--- trunk/src/ash/wm/resize_shadow_and_cursor_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/resize_shadow_and_cursor_unittest.cc	(working copy)
@@ -11,10 +11,10 @@
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/hit_test.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ -116,7 +116,7 @@
 // Test whether the resize shadows are visible and the cursor type based on the
 // mouse's position.
 TEST_F(ResizeShadowAndCursorTest, MouseHover) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(50, 50);
@@ -159,7 +159,7 @@
 // Test that the resize shadows stay visible and that the cursor stays the same
 // as long as a user is resizing a window.
 TEST_F(ResizeShadowAndCursorTest, MouseDrag) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
   gfx::Size initial_size(window()->bounds().size());
 
@@ -183,7 +183,7 @@
 // Test that the resize shadows stay visible while resizing a window via touch.
 TEST_F(ResizeShadowAndCursorTest, Touch) {
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   int start_x = 200 + ash::kResizeOutsideBoundsSize - 1;
   int start_y = 100 + ash::kResizeOutsideBoundsSize - 1;
@@ -199,7 +199,7 @@
 // Test that the resize shadows are not visible and that the default cursor is
 // used when the window is maximized.
 TEST_F(ResizeShadowAndCursorTest, MaximizeRestore) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(200, 50);