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

ash/test/test_shell_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/test/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/gpu_support_stub.h"
 #include "ash/palette_delegate.h"
@@ skipping 21 matching lines @@
 namespace test {
 
 // A ShellObserver that sets the shelf alignment and auto hide behavior when the
 // shelf is created, to simulate ChromeLauncherController's behavior.
 class ShelfInitializer : public ShellObserver {
  public:
   ShelfInitializer() { Shell::Get()->AddShellObserver(this); }
   ~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) {
       shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
       shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
       shelf->UpdateVisibilityState();
     }
   }
 
  private:
@@ skipping 106 matching lines @@
 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
                                                      bool use_local_state) {
   if (use_local_state)
     touchscreen_enabled_in_local_pref_ = enabled;
 }
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
 }  // namespace test
 }  // namespace ash