events: Move EventTarget into Event.

ui/aura/test/test_event_filter.cc

Index: ui/aura/test/test_event_filter.cc
diff --git a/ui/aura/test/test_event_filter.cc b/ui/aura/test/test_event_filter.cc
index 87007ada0549fccd3ceac643ac8d854b63deb524..74613f07dae5b3358072c68fcc2197d387ab02db 100644
--- a/ui/aura/test/test_event_filter.cc
+++ b/ui/aura/test/test_event_filter.cc
@@ -25,32 +25,27 @@ void TestEventFilter::ResetCounts() {
   touch_event_count_ = 0;
 }
 
-ui::EventResult TestEventFilter::OnKeyEvent(ui::EventTarget* target,
-                                            ui::KeyEvent* event) {
+ui::EventResult TestEventFilter::OnKeyEvent(ui::KeyEvent* event) {
   ++key_event_count_;
   return key_event_handling_result_;
 }
 
-ui::EventResult TestEventFilter::OnMouseEvent(ui::EventTarget* target,
-                                              ui::MouseEvent* event) {
+ui::EventResult TestEventFilter::OnMouseEvent(ui::MouseEvent* event) {
   ++mouse_event_count_;
   return mouse_event_handling_result_;
 }
 
-ui::EventResult TestEventFilter::OnScrollEvent(ui::EventTarget* target,
-                                               ui::ScrollEvent* event) {
+ui::EventResult TestEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::TouchStatus TestEventFilter::OnTouchEvent(ui::EventTarget* target,
-                                              ui::TouchEvent* event) {
+ui::TouchStatus TestEventFilter::OnTouchEvent(ui::TouchEvent* event) {
   ++touch_event_count_;
   // TODO(sadrul): !
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::EventResult TestEventFilter::OnGestureEvent(ui::EventTarget* target,
-                                                ui::GestureEvent* event) {
+ui::EventResult TestEventFilter::OnGestureEvent(ui::GestureEvent* event) {
   // TODO(sadrul): !
   return ui::ER_UNHANDLED;
 }