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

Some purely mechanical changes left over from r283694, now that
aura::test::EventGenerator has moved to ui::test in src/ui/events.

Moves aura/test/event_generator.* to event_generator_delegate_aura.*
Removes `using ui::test::EventGenerator;` declaration and redirects
includes that don't extend the delegate to include the ui/test
event_generator.h directly

BUG=378134

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285209

Review URL: https://codereview.chromium.org/406413004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285857 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc
index 0c0ee28..6c1412b 100644
--- a/ash/wm/gestures/overview_gesture_handler_unittest.cc
+++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc
@@ -6,11 +6,11 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/overview/window_selector_controller.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.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -42,7 +42,7 @@ TEST_F(OverviewGestureHandlerTest, VerticalSwipes) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  aura::test::EventGenerator generator(root_window, root_window);
+  ui::test::EventGenerator generator(root_window, root_window);
   generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
       0, -500, 100, 3);
   EXPECT_TRUE(IsSelecting());
@@ -69,7 +69,7 @@ TEST_F(OverviewGestureHandlerTest, HorizontalSwipes) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  aura::test::EventGenerator generator(root_window, root_window);
+  ui::test::EventGenerator generator(root_window, root_window);
   generator.ScrollSequence(gfx::Point(), base::TimeDelta::FromMilliseconds(5),
       600, -500, 100, 3);
   EXPECT_FALSE(IsSelecting());
@@ -86,7 +86,7 @@ TEST_F(OverviewGestureHandlerTest, SwipeUpDownWithoutReleasing) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  aura::test::EventGenerator generator(root_window, root_window);
+  ui::test::EventGenerator generator(root_window, root_window);
   base::TimeDelta timestamp = base::TimeDelta::FromInternalValue(
       base::TimeTicks::Now().ToInternalValue());
   gfx::Point start;
@@ -146,7 +146,7 @@ TEST_F(OverviewGestureHandlerTest, GestureSwipe) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  aura::test::EventGenerator generator(root_window, root_window);
+  ui::test::EventGenerator generator(root_window, root_window);
   gfx::Point start_points[3];
   start_points[0] = start_points[1] = start_points[2] = gfx::Point();
   generator.GestureMultiFingerScroll(3, start_points, 5, 10, 0, 100);
@@ -163,7 +163,7 @@ TEST_F(OverviewGestureHandlerTest, GestureSwipeTopOfWindow) {
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   scoped_ptr<aura::Window> window1(CreateWindow(bounds));
   scoped_ptr<aura::Window> window2(CreateWindow(bounds));
-  aura::test::EventGenerator generator(root_window, window2.get());
+  ui::test::EventGenerator generator(root_window, window2.get());
   gfx::Point start_points[3];
   start_points[0] = start_points[1] = start_points[2] = gfx::Point(105, 105);
   generator.GestureMultiFingerScroll(3, start_points, 5, 10, 0, 100);