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

trunk/src/ash/wm/overview/window_selector_unittest.cc

Index: trunk/src/ash/wm/overview/window_selector_unittest.cc
===================================================================
--- trunk/src/ash/wm/overview/window_selector_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/overview/window_selector_unittest.cc	(working copy)
@@ -35,12 +35,12 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/controls/label.h"
@@ -170,13 +170,13 @@
   }
 
   void ClickWindow(aura::Window* window) {
-    ui::test::EventGenerator event_generator(window->GetRootWindow(), window);
+    aura::test::EventGenerator event_generator(window->GetRootWindow(), window);
     gfx::RectF target = GetTransformedBounds(window);
     event_generator.ClickLeftButton();
   }
 
   void SendKey(ui::KeyboardCode key) {
-    ui::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
+      aura::test::EventGenerator event_generator(Shell::GetPrimaryRootWindow());
       event_generator.PressKey(key, 0);
       event_generator.ReleaseKey(key, 0);
   }
@@ -321,8 +321,8 @@
   EXPECT_EQ(window1.get(), GetFocusedWindow());
   ToggleOverview();
   EXPECT_EQ(text_filter_widget()->GetNativeWindow(), GetFocusedWindow());
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                     window2.get());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       window2.get());
   generator.GestureTapAt(gfx::ToEnclosingRect(
       GetTransformedTargetBounds(window2.get())).CenterPoint());
   EXPECT_EQ(window2.get(), GetFocusedWindow());
@@ -377,7 +377,7 @@
   aura::Window* window2 = widget->GetNativeWindow();
   gfx::RectF bounds = GetTransformedBoundsInRootWindow(window2);
   gfx::Point point(bounds.top_right().x() - 1, bounds.top_right().y() - 1);
-  ui::test::EventGenerator event_generator(window2->GetRootWindow(), point);
+  aura::test::EventGenerator event_generator(window2->GetRootWindow(), point);
 
   EXPECT_FALSE(widget->IsClosed());
   event_generator.ClickLeftButton();
@@ -1013,7 +1013,7 @@
 
   gfx::RectF bounds1 = GetTransformedBoundsInRootWindow(window1);
   gfx::Point point1(bounds1.top_right().x() - 1, bounds1.top_right().y() - 1);
-  ui::test::EventGenerator event_generator1(window1->GetRootWindow(), point1);
+  aura::test::EventGenerator event_generator1(window1->GetRootWindow(), point1);
 
   EXPECT_FALSE(widget1->IsClosed());
   event_generator1.ClickLeftButton();
@@ -1031,7 +1031,7 @@
 
   gfx::RectF bounds2 = GetTransformedBoundsInRootWindow(window2);
   gfx::Point point2(bounds2.top_right().x() - 1, bounds2.top_right().y() - 1);
-  ui::test::EventGenerator event_generator2(window2->GetRootWindow(), point2);
+  aura::test::EventGenerator event_generator2(window2->GetRootWindow(), point2);
 
   EXPECT_FALSE(widget2->IsClosed());
   event_generator2.ClickLeftButton();