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

trunk/src/ash/wm/lock_state_controller_unittest.cc

Index: trunk/src/ash/wm/lock_state_controller_unittest.cc
===================================================================
--- trunk/src/ash/wm/lock_state_controller_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/lock_state_controller_unittest.cc	(working copy)
@@ -17,12 +17,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
@@ -113,7 +113,8 @@
 
  protected:
   void GenerateMouseMoveEvent() {
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+    aura::test::EventGenerator generator(
+        Shell::GetPrimaryRootWindow());
     generator.MoveMouseTo(10, 10);
   }