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

trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc

Index: trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc
===================================================================
--- trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/panels/panel_layout_manager_unittest.cc	(working copy)
@@ -31,12 +31,12 @@
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -220,7 +220,7 @@
     int index = model->ItemIndexByID(GetShelfIDForWindow(window));
     gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
 
-    ui::test::EventGenerator& event_generator = GetEventGenerator();
+    aura::test::EventGenerator& event_generator = GetEventGenerator();
     event_generator.MoveMouseTo(bounds.CenterPoint());
     event_generator.ClickLeftButton();