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

athena/input/accelerator_manager_unittest.cc

Index: athena/input/accelerator_manager_unittest.cc
diff --git a/athena/input/accelerator_manager_unittest.cc b/athena/input/accelerator_manager_unittest.cc
index 4f4c75335603fc498f5f391595af5b8c1e2a28ec..cd74ee1613af07916797fd88b9fa4a5cbc234e02 100644
--- a/athena/input/accelerator_manager_unittest.cc
+++ b/athena/input/accelerator_manager_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "athena/input/public/input_manager.h"
 #include "athena/test/athena_test_base.h"
-#include "ui/aura/test/event_generator.h"
+#include "ui/events/test/event_generator.h"
 
 namespace athena {
 namespace {
@@ -71,7 +71,7 @@ TEST_F(InputManagerTest, Basic) {
   accelerator_manager->RegisterAccelerators(
       data, arraysize(data), &test_handler);
 
-  aura::test::EventGenerator generator(root_window());
+  ui::test::EventGenerator generator(root_window());
   generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset());