Make ToplevelWindowEventFilter and WorkspaceEventFilter into event handlers.

ash/wm/workspace_controller_test_helper.cc

Index: ash/wm/workspace_controller_test_helper.cc
===================================================================
--- ash/wm/workspace_controller_test_helper.cc	(revision 155914)
+++ ash/wm/workspace_controller_test_helper.cc	(working copy)
@@ -5,7 +5,7 @@
 #include "ash/wm/workspace_controller_test_helper.h"
 
 #include "ash/wm/workspace_controller.h"
-#include "ash/wm/workspace/workspace_event_filter_test_helper.h"
+#include "ash/wm/workspace/workspace_event_handler_test_helper.h"
 #include "ui/aura/window.h"
 
 namespace ash {
@@ -19,16 +19,18 @@
 WorkspaceControllerTestHelper::~WorkspaceControllerTestHelper() {
 }
 
-WorkspaceEventFilter* WorkspaceControllerTestHelper::GetFilter() {
-  if (WorkspaceController::IsWorkspace2Enabled())
-    return static_cast<WorkspaceEventFilter*>(
-        controller_->viewport_->children()[0]->event_filter());
-  return controller_->event_filter_;
+WorkspaceEventHandler* WorkspaceControllerTestHelper::GetEventHandler() {
+  if (WorkspaceController::IsWorkspace2Enabled()) {
+    ui::EventTarget::TestApi test_api(controller_->viewport_->children()[0]);
+    return static_cast<WorkspaceEventHandler*>(
+        test_api.pre_target_handlers().front());
+  }
+  return controller_->event_handler_;
 }
 
 MultiWindowResizeController*
 WorkspaceControllerTestHelper::GetMultiWindowResizeController() {
-  return WorkspaceEventFilterTestHelper(GetFilter()).resize_controller();
+  return WorkspaceEventHandlerTestHelper(GetEventHandler()).resize_controller();
 }
 
 }  // namespace internal