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

trunk/src/ash/wm/window_modality_controller_unittest.cc

Index: trunk/src/ash/wm/window_modality_controller_unittest.cc
===================================================================
--- trunk/src/ash/wm/window_modality_controller_unittest.cc	(revision 285220)
+++ trunk/src/ash/wm/window_modality_controller_unittest.cc	(working copy)
@@ -9,12 +9,12 @@
 #include "ash/test/child_modal_window.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.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/base/ui_base_types.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/views/test/capture_tracking_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
@@ -189,8 +189,8 @@
 
   {
     // Clicking a point within w1 should activate that window.
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(10, 10));
+    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                         gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   }
@@ -199,8 +199,8 @@
 
   {
     // Clicking a point within w1 should activate w11.
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(10, 10));
+    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                         gfx::Point(10, 10));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
@@ -223,8 +223,8 @@
   wm::ActivateWindow(w2.get());
   {
     // Clicking a point on w1 that is not eclipsed by w2.
-    ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                       gfx::Point(90, 90));
+    aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                         gfx::Point(90, 90));
     generator.ClickLeftButton();
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
   }
@@ -276,7 +276,7 @@
 
   gfx::Point center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &center);
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), center);
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), center);
   generator.PressLeftButton();
   EXPECT_TRUE(view->got_press());
 
@@ -347,8 +347,8 @@
   TouchTrackerWindowDelegate d11;
   scoped_ptr<aura::Window> w11(CreateTestWindowInShellWithDelegate(&d11,
       -11, gfx::Rect(20, 20, 50, 50)));
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
-                                     gfx::Point(10, 10));
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
+                                       gfx::Point(10, 10));
 
   ::wm::AddTransientChild(w1.get(), w11.get());
   d1.reset();
@@ -479,7 +479,7 @@
   EXPECT_FALSE(parent->HasFocus());
 
   {
-    ui::test::EventGenerator generator(
+    aura::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         parent->bounds().origin() +
             gfx::Vector2d(10, parent->bounds().height() - 10));
@@ -496,7 +496,7 @@
   }
 
   {
-    ui::test::EventGenerator generator(
+    aura::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         parent->bounds().origin() + gfx::Vector2d(10, 10));
     generator.ClickLeftButton();
@@ -511,7 +511,7 @@
   }
 
   {
-    ui::test::EventGenerator generator(
+    aura::test::EventGenerator generator(
         Shell::GetPrimaryRootWindow(),
         child->bounds().origin() + gfx::Vector2d(10, 10));
     generator.ClickLeftButton();