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

trunk/src/ash/wm/partial_screenshot_view_unittest.cc

Index: trunk/src/ash/wm/partial_screenshot_view_unittest.cc
===================================================================
--- trunk/src/ash/wm/partial_screenshot_view_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/partial_screenshot_view_unittest.cc	(working copy)
@@ -9,8 +9,8 @@
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
@@ -35,7 +35,7 @@
 };
 
 TEST_F(PartialScreenshotViewTest, BasicMouse) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   generator.MoveMouseTo(100, 100);
   generator.PressLeftButton();
@@ -53,7 +53,7 @@
 }
 
 TEST_F(PartialScreenshotViewTest, BasicTouch) {
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   generator.set_current_location(gfx::Point(100,100));
   generator.GestureTapDownAndUp(gfx::Point(100,100));