Move TestEventHandler to ui/events/test

ash/shell_unittest.cc

Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 8b000921271f9f8054dbe81c5558a98d3393a80e..781b32a638816ea173100ed12819bf008ca776b0 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -26,11 +26,11 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/events/test/events_test_utils.h"
+#include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
@@ -516,7 +516,7 @@ TEST_F(ShellTest, TestPreTargetHandlerOrder) {
 
 // Verifies an EventHandler added to Env gets notified from EventGenerator.
 TEST_F(ShellTest, EnvPreTargetHandler) {
-  aura::test::TestEventHandler event_handler;
+  ui::test::TestEventHandler event_handler;
   aura::Env::GetInstance()->AddPreTargetHandler(&event_handler);
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseBy(1, 1);