Move TestEventHandler to ui/events/test

ui/events/test/test_event_handler.h

Index: ui/events/test/test_event_handler.h
diff --git a/ui/aura/test/test_event_handler.h b/ui/events/test/test_event_handler.h
similarity index 64%
rename from ui/aura/test/test_event_handler.h
rename to ui/events/test/test_event_handler.h
index 4998630e314500664e6c960cd5d7ba567af8c175..e0c2fca95343200982c7d6cd79c29a79b5edeaca 100644
--- a/ui/aura/test/test_event_handler.h
+++ b/ui/events/test/test_event_handler.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_TEST_TEST_EVENT_HANDLER_H_
-#define UI_AURA_TEST_TEST_EVENT_HANDLER_H_
+#ifndef UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_
+#define UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/events/event_handler.h"
 
-namespace aura {
+namespace ui {
 namespace test {
 
 // A simple EventHandler that keeps track of the number of key events that it's
 // seen.
-class TestEventHandler : public ui::EventHandler {
+class TestEventHandler : public EventHandler {
  public:
   TestEventHandler();
   virtual ~TestEventHandler();
@@ -27,12 +27,12 @@ class TestEventHandler : public ui::EventHandler {
 
   void Reset();
 
-  // ui::EventHandler overrides:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  // EventHandler overrides:
+  virtual void OnKeyEvent(KeyEvent* event) OVERRIDE;
+  virtual void OnMouseEvent(MouseEvent* event) OVERRIDE;
+  virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE;
+  virtual void OnTouchEvent(TouchEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(GestureEvent* event) OVERRIDE;
 
  private:
   // How many events have been received of each type?
@@ -46,6 +46,6 @@ class TestEventHandler : public ui::EventHandler {
 };
 
 }  // namespace test
-}  // namespace aura
+}  // namespace ui
 
-#endif // UI_AURA_TEST_TEST_EVENT_HANDLER_H_
+#endif // UI_EVENTS_TEST_TEST_EVENT_HANDLER_H_