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

trunk/src/ui/keyboard/keyboard_controller_unittest.cc

Index: trunk/src/ui/keyboard/keyboard_controller_unittest.cc
===================================================================
--- trunk/src/ui/keyboard/keyboard_controller_unittest.cc	(revision 285220)
+++ trunk/src/ui/keyboard/keyboard_controller_unittest.cc	(working copy)
@@ -12,6 +12,7 @@
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/aura_test_helper.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -26,7 +27,6 @@
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/compositor/test/layer_animator_test_controller.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/keyboard/keyboard_controller_proxy.h"
@@ -294,7 +294,7 @@
   EventObserver observer;
   keyboard_container->AddPreTargetHandler(&observer);
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
   generator.MoveMouseTo(proxy()->GetKeyboardWindow()->bounds().CenterPoint());
   generator.ClickLeftButton();
   EXPECT_TRUE(window->HasFocus());