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

> 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
> 
> Review URL: https://codereview.chromium.org/406413004

TBR=tapted@chromium.org

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

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

1 files changed, 4 insertions, 3 deletions

diff --git a/ash/wm/app_list_controller_unittest.cc b/ash/wm/app_list_controller_unittest.cc
index 05ceae3..da663d6 100644
--- a/ash/wm/app_list_controller_unittest.cc
+++ b/ash/wm/app_list_controller_unittest.cc
@@ -11,9 +11,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/views/app_list_view.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
-#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
@@ -86,7 +86,8 @@ TEST_P(AppListControllerTest, ClickOutsideBubbleClosesBubble) {
 
   aura::Window* app_window = shell->GetAppListWindow();
   ASSERT_TRUE(app_window);
-  ui::test::EventGenerator generator(shell->GetPrimaryRootWindow(), app_window);
+  aura::test::EventGenerator generator(shell->GetPrimaryRootWindow(),
+                                       app_window);
   // Click on the bubble itself. The bubble should remain visible.
   generator.ClickLeftButton();
   EXPECT_TRUE(shell->GetAppListTargetVisibility());
@@ -111,7 +112,7 @@ TEST_P(AppListControllerTest, TapOutsideBubbleClosesBubble) {
   ASSERT_TRUE(app_window);
   gfx::Rect app_window_bounds = app_window->GetBoundsInRootWindow();
 
-  ui::test::EventGenerator generator(shell->GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(shell->GetPrimaryRootWindow());
   // Click on the bubble itself. The bubble should remain visible.
   generator.GestureTapAt(app_window_bounds.CenterPoint());
   EXPECT_TRUE(shell->GetAppListTargetVisibility());