[mus+ash] Removes WmWindow from ash/wm/root_window_finder.h

ash/autoclick/autoclick_controller.cc

Index: ash/autoclick/autoclick_controller.cc
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
index 855ac1e586e9ee62efe6bd708dfcc0e37a41ab2a..f0c0c0f3f355774ddcc5a91010ca973530503aa7 100644
--- a/ash/autoclick/autoclick_controller.cc
+++ b/ash/autoclick/autoclick_controller.cc
@@ -9,7 +9,6 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/root_window_finder.h"
-#include "ash/wm_window.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tree_host.h"
@@ -138,8 +137,7 @@ void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
 
 views::Widget* AutoclickControllerImpl::CreateAutoclickRingWidget(
     const gfx::Point& event_location) {
-  aura::Window* target =
-      WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
+  aura::Window* target = ash::wm::GetRootWindowAt(event_location);
   SetTapDownTarget(target);
   aura::Window* root_window = target->GetRootWindow();
   widget_.reset(new views::Widget);
@@ -160,8 +158,7 @@ views::Widget* AutoclickControllerImpl::CreateAutoclickRingWidget(
 void AutoclickControllerImpl::UpdateAutoclickRingWidget(
     views::Widget* widget,
     const gfx::Point& event_location) {
-  aura::Window* target =
-      WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(event_location));
+  aura::Window* target = ash::wm::GetRootWindowAt(event_location);
   SetTapDownTarget(target);
   aura::Window* root_window = target->GetRootWindow();
   if (widget->GetNativeView()->GetRootWindow() != root_window) {
@@ -173,8 +170,7 @@ void AutoclickControllerImpl::UpdateAutoclickRingWidget(
 
 void AutoclickControllerImpl::DoAutoclick(const gfx::Point& event_location,
                                           const int mouse_event_flags) {
-  aura::Window* root_window =
-      WmWindow::GetAuraWindow(wm::GetRootWindowAt(event_location));
+  aura::Window* root_window = wm::GetRootWindowAt(event_location);
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(event_location);