[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/test/test_shell_delegate.cc

Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 09f5eb44a0cd7a6a37019d5c63d7257b77287866..204b3a3dd655b4b6fd0fc64d86e73fcceffad064 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -39,8 +39,8 @@ class ShelfInitializer : public ShellObserver {
   ~ShelfInitializer() override { Shell::Get()->RemoveShellObserver(this); }
 
   // ShellObserver:
-  void OnShelfCreatedForRootWindow(WmWindow* root_window) override {
-    Shelf* shelf = root_window->GetRootWindowController()->GetShelf();
+  void OnShelfCreatedForRootWindow(aura::Window* root_window) override {
+    Shelf* shelf = RootWindowController::ForWindow(root_window)->GetShelf();
     // Do not override the custom initialization performed by some unit tests.
     if (shelf->alignment() == SHELF_ALIGNMENT_BOTTOM_LOCKED &&
         shelf->auto_hide_behavior() == SHELF_AUTO_HIDE_ALWAYS_HIDDEN) {