[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

ash/wm/workspace/workspace_event_handler_aura.cc

Index: ash/wm/workspace/workspace_event_handler_aura.cc
diff --git a/ash/wm/workspace/workspace_event_handler_aura.cc b/ash/wm/workspace/workspace_event_handler_aura.cc
index a011309991600bb5c8e049490279e7850e1ae735..55c663a7ee96e56402f348518851437063f4a19c 100644
--- a/ash/wm/workspace/workspace_event_handler_aura.cc
+++ b/ash/wm/workspace/workspace_event_handler_aura.cc
@@ -4,19 +4,20 @@
 
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 
-#include "ash/wm_window.h"
+#include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 
 namespace ash {
 
-WorkspaceEventHandlerAura::WorkspaceEventHandlerAura(WmWindow* workspace_window)
+WorkspaceEventHandlerAura::WorkspaceEventHandlerAura(
+    aura::Window* workspace_window)
     : workspace_window_(workspace_window) {
-  workspace_window_->AddLimitedPreTargetHandler(this);
+  wm::AddLimitedPreTargetHandlerForWindow(this, workspace_window_);
 }
 
 WorkspaceEventHandlerAura::~WorkspaceEventHandlerAura() {
-  workspace_window_->RemoveLimitedPreTargetHandler(this);
+  wm::RemoveLimitedPreTargetHandlerForWindow(this, workspace_window_);
 }
 
 void WorkspaceEventHandlerAura::OnMouseEvent(ui::MouseEvent* event) {