Cleanups for aura/test/event_generator.h (resolve TODOs)

ash/wm/system_gesture_event_filter_unittest.cc

Index: ash/wm/system_gesture_event_filter_unittest.cc
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 06b6fce8c2b339a31de7d707faa48f2fb2008672..705e3645e80bd008a07749668dac851d1505d9f8 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -22,7 +22,6 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -31,6 +30,7 @@
 #include "ui/events/event_handler.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gestures/gesture_configuration.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
@@ -249,8 +249,7 @@ TEST_F(SystemGestureEventFilterTest, TwoFingerDrag) {
     gfx::Point(350, 350),
   };
 
-  aura::test::EventGenerator generator(root_window,
-                                       toplevel->GetNativeWindow());
+  ui::test::EventGenerator generator(root_window, toplevel->GetNativeWindow());
 
   wm::WindowState* toplevel_state =
       wm::GetWindowState(toplevel->GetNativeWindow());
@@ -316,7 +315,7 @@ TEST_F(SystemGestureEventFilterTest, TwoFingerDragTwoWindows) {
     second_bounds.origin() + gfx::Vector2d(40, 20)
   };
 
-  aura::test::EventGenerator generator(root_window);
+  ui::test::EventGenerator generator(root_window);
   // Do not drag too fast to avoid fling.
   generator.GestureMultiFingerScroll(kTouchPoints, points,
       50, kSteps, 0, 150);
@@ -341,8 +340,7 @@ TEST_F(SystemGestureEventFilterTest, WindowsWithMaxSizeDontSnap) {
     gfx::Point(bounds.x() + 30, bounds.y() + 20),
   };
 
-  aura::test::EventGenerator generator(root_window,
-                                       toplevel->GetNativeWindow());
+  ui::test::EventGenerator generator(root_window, toplevel->GetNativeWindow());
 
   // Swipe down to minimize.
   generator.GestureMultiFingerScroll(kTouchPoints, points, 15, kSteps, 0, 150);
@@ -405,8 +403,7 @@ TEST_F(SystemGestureEventFilterTest, DISABLED_TwoFingerDragEdge) {
   EXPECT_EQ(HTLEFT, toplevel->GetNativeWindow()->delegate()->
         GetNonClientComponent(points[1]));
 
-  aura::test::EventGenerator generator(root_window,
-                                       toplevel->GetNativeWindow());
+  ui::test::EventGenerator generator(root_window, toplevel->GetNativeWindow());
 
   bounds = toplevel->GetNativeWindow()->bounds();
   // Swipe down. Nothing should happen.
@@ -466,8 +463,7 @@ TEST_F(SystemGestureEventFilterTest, TwoFingerDragDelayed) {
   EXPECT_EQ(HTCAPTION, toplevel->GetNativeWindow()->delegate()->
         GetNonClientComponent(points[1]));
 
-  aura::test::EventGenerator generator(root_window,
-                                       toplevel->GetNativeWindow());
+  ui::test::EventGenerator generator(root_window, toplevel->GetNativeWindow());
 
   bounds = toplevel->GetNativeWindow()->bounds();
   // Swipe right and down starting with one finger.
@@ -502,8 +498,7 @@ TEST_F(SystemGestureEventFilterTest, ThreeFingerGestureStopsDrag) {
   EXPECT_EQ(HTCAPTION, toplevel->GetNativeWindow()->delegate()->
         GetNonClientComponent(points[1]));
 
-  aura::test::EventGenerator generator(root_window,
-                                       toplevel->GetNativeWindow());
+  ui::test::EventGenerator generator(root_window, toplevel->GetNativeWindow());
 
   bounds = toplevel->GetNativeWindow()->bounds();
   // Swipe right and down starting with two fingers.
@@ -532,7 +527,7 @@ TEST_F(SystemGestureEventFilterTest, DragLeftNearEdgeSnaps) {
     gfx::Point(bounds.x() + bounds.width() / 2, bounds.y() + 5),
   };
   aura::Window* toplevel_window = toplevel->GetNativeWindow();
-  aura::test::EventGenerator generator(root_window, toplevel_window);
+  ui::test::EventGenerator generator(root_window, toplevel_window);
 
   // Check that dragging left snaps before reaching the screen edge.
   gfx::Rect work_area =
@@ -560,7 +555,7 @@ TEST_F(SystemGestureEventFilterTest, DragRightNearEdgeSnaps) {
     gfx::Point(bounds.x() + bounds.width() / 2, bounds.y() + 5),
   };
   aura::Window* toplevel_window = toplevel->GetNativeWindow();
-  aura::test::EventGenerator generator(root_window, toplevel_window);
+  ui::test::EventGenerator generator(root_window, toplevel_window);
 
   // Check that dragging right snaps before reaching the screen edge.
   gfx::Rect work_area =