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

trunk/src/ash/display/mirror_window_controller_unittest.cc

Index: trunk/src/ash/display/mirror_window_controller_unittest.cc
===================================================================
--- trunk/src/ash/display/mirror_window_controller_unittest.cc	(revision 285220)
+++ trunk/src/ash/display/mirror_window_controller_unittest.cc	(working copy)
@@ -12,12 +12,12 @@
 #include "ash/test/mirror_window_test_api.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.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/hit_test.h"
-#include "ui/events/test/event_generator.h"
 
 namespace ash {
 
@@ -87,7 +87,7 @@
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
-  ui::test::EventGenerator generator(root);
+  aura::test::EventGenerator generator(root);
   generator.MoveMouseTo(10, 10);
 
   // Test if cursor movement is propertly reflected in mirror window.
@@ -144,7 +144,7 @@
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
-  ui::test::EventGenerator generator(root);
+  aura::test::EventGenerator generator(root);
   generator.MoveMouseToInHost(100, 100);
 
   // Test if cursor movement is propertly reflected in mirror window.
@@ -200,7 +200,7 @@
   UpdateDisplay("400x600*2,400x600");
 
   aura::Window* root = Shell::GetInstance()->GetPrimaryRootWindow();
-  ui::test::EventGenerator generator(root);
+  aura::test::EventGenerator generator(root);
   generator.MoveMouseToInHost(10, 20);
 
   gfx::Point hot_point = test_api.GetCursorHotPoint();