Cleanups for aura/test/event_generator.h (resolve TODOs)

ash/accelerators/magnifier_key_scroller_unittest.cc

Index: ash/accelerators/magnifier_key_scroller_unittest.cc
diff --git a/ash/accelerators/magnifier_key_scroller_unittest.cc b/ash/accelerators/magnifier_key_scroller_unittest.cc
index 21eb2ab1709e1bc3c5494e077aeca85fc5d84723..e9c6abe83abf9b3e1c0e1d192d1d73842f0ecc4c 100644
--- a/ash/accelerators/magnifier_key_scroller_unittest.cc
+++ b/ash/accelerators/magnifier_key_scroller_unittest.cc
@@ -8,8 +8,8 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
+#include "ui/events/test/event_generator.h"
 
 namespace ash {
 namespace {
@@ -52,7 +52,7 @@ TEST_F(MagnifierKeyScrollerTest, Basic) {
   controller->SetEnabled(true);
 
   EXPECT_EQ("200,150", controller->GetWindowPosition().ToString());
-  aura::test::EventGenerator& generator = GetEventGenerator();
+  ui::test::EventGenerator& generator = GetEventGenerator();
 
   // Click and Release generates the press event upon release.
   generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN);