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

trunk/src/ash/tooltips/tooltip_controller_unittest.cc

Index: trunk/src/ash/tooltips/tooltip_controller_unittest.cc
===================================================================
--- trunk/src/ash/tooltips/tooltip_controller_unittest.cc	(revision 285220)
+++ trunk/src/ash/tooltips/tooltip_controller_unittest.cc	(working copy)
@@ -6,10 +6,10 @@
 #include "ash/test/ash_test_base.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/env.h"
+#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/events/test/event_generator.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/views/corewm/tooltip_controller.h"
@@ -105,7 +105,7 @@
   EXPECT_EQ(base::string16(), helper_->GetTooltipText());
   EXPECT_EQ(NULL, helper_->GetTooltipWindow());
 
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 view->bounds().CenterPoint());
   base::string16 expected_tooltip = base::ASCIIToUTF16("Tooltip Text");
@@ -148,7 +148,7 @@
   EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[1]);
 
   // Show tooltip on second display.
-  ui::test::EventGenerator generator(root_windows[1]);
+  aura::test::EventGenerator generator(root_windows[1]);
   generator.MoveMouseRelativeTo(widget2->GetNativeView(),
                                 view2->bounds().CenterPoint());
   helper_->FireTooltipTimer();
@@ -167,7 +167,7 @@
 
   // The tooltip should create a new aura window for itself, so we should still
   // be able to show tooltips on the primary display.
-  ui::test::EventGenerator generator1(root_windows[0]);
+  aura::test::EventGenerator generator1(root_windows[0]);
   generator1.MoveMouseRelativeTo(widget1->GetNativeView(),
                                  view1->bounds().CenterPoint());
   helper_->FireTooltipTimer();