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

trunk/src/ui/views/widget/widget_interactive_uitest.cc

Index: trunk/src/ui/views/widget/widget_interactive_uitest.cc
===================================================================
--- trunk/src/ui/views/widget/widget_interactive_uitest.cc	(revision 285220)
+++ trunk/src/ui/views/widget/widget_interactive_uitest.cc	(working copy)
@@ -11,13 +11,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ -769,7 +769,7 @@
 
   RunPendingMessages();
 
-  ui::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow());
+  aura::test::EventGenerator generator(widget.GetNativeView()->GetRootWindow());
   generator.GestureTapAt(gfx::Point(10, 10));
   ShowQuickMenuImmediately(static_cast<TouchSelectionControllerImpl*>(
       textfield_test_api.touch_selection_controller()));