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

trunk/src/content/browser/web_contents/aura/window_slider_unittest.cc

Index: trunk/src/content/browser/web_contents/aura/window_slider_unittest.cc
===================================================================
--- trunk/src/content/browser/web_contents/aura/window_slider_unittest.cc	(revision 285220)
+++ trunk/src/content/browser/web_contents/aura/window_slider_unittest.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
@@ -16,7 +17,6 @@
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/frame_time.h"
 
 namespace content {
@@ -214,7 +214,7 @@
   window->SetBounds(gfx::Rect(0, 0, 400, 400));
   WindowSliderDelegateTest slider_delegate;
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   WindowSlider* slider =
@@ -310,7 +310,7 @@
   new WindowSlider(&slider_delegate, root_window(), window.get());
   for (int i = 0; events[i]; ++i) {
     // Generate a horizontal overscroll.
-    ui::test::EventGenerator generator(root_window());
+    aura::test::EventGenerator generator(root_window());
     generator.GestureScrollSequenceWithCallback(
         gfx::Point(10, 10),
         gfx::Point(80, 10),
@@ -352,7 +352,7 @@
                                  gfx::Point(55, 10),
                                  0, 0);
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Start the scroll sequence. Scroll forward so that |window|'s layer is the
   // one animating.
@@ -452,7 +452,7 @@
 
   // Generate a horizontal scroll, and change the owner in the middle of the
   // scroll.
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
   aura::Window* old_window = window.get();
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(10, 10),
@@ -484,7 +484,7 @@
   WindowSlider* slider =
       new WindowSlider(&slider_delegate, root_window(), window.get());
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // No slide in progress should be reported during scroll since the layer
   // wasn't created.
@@ -530,7 +530,7 @@
   EXPECT_EQ(child_windows + 1, root_window()->children().size());
 
   WindowSliderDeleteOwnerOnDestroy slider_delegate(window);
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   scoped_ptr<WindowSlider> slider(
@@ -561,7 +561,7 @@
   EXPECT_EQ(child_windows + 1, root_window()->children().size());
 
   WindowSliderDeleteOwnerOnComplete slider_delegate(window);
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Generate a horizontal overscroll.
   new WindowSlider(&slider_delegate, root_window(), window);
@@ -598,7 +598,7 @@
   animator->set_disable_timer_for_test(true);
   ui::LayerAnimatorTestController test_controller(animator);
 
-  ui::test::EventGenerator generator(root_window());
+  aura::test::EventGenerator generator(root_window());
 
   // Swipe forward so that |window|'s layer is the one animating.
   generator.GestureScrollSequence(