Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/disconnected_app_handler.cc

 // Copyright 2016 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/mus/disconnected_app_handler.h"
 
-#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/aura/wm_window_aura.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 bool IsContainer(aura::Window* window) {
-  return WmWindowMus::Get(window)->IsContainer();
+  return WmWindowAura::Get(window)->GetShellWindowId() !=
+         kShellWindowId_Invalid;
 }
 
 }  // namespace
 
 DisconnectedAppHandler::DisconnectedAppHandler(aura::Window* root_window) {
-  WmWindowMus* root = WmWindowMus::Get(root_window);
+  ash::WmWindowAura* root = ash::WmWindowAura::Get(root_window);
   for (int shell_window_id = kShellWindowId_Min;
        shell_window_id < kShellWindowId_Max; ++shell_window_id) {
     // kShellWindowId_VirtualKeyboardContainer is lazily created.
     // TODO(sky): http://crbug.com/616909 .
     // kShellWindowId_PhantomWindow is not a container, but a window.
     if (shell_window_id == kShellWindowId_VirtualKeyboardContainer ||
         shell_window_id == kShellWindowId_PhantomWindow)
       continue;
 
 // kShellWindowId_MouseCursorContainer is chromeos specific.
 #if !defined(OS_CHROMEOS)
     if (shell_window_id == kShellWindowId_MouseCursorContainer)
       continue;
 #endif
 
-    WmWindowMus* container = WmWindowMus::AsWmWindowMus(
+    ash::WmWindowAura* container = static_cast<ash::WmWindowAura*>(
         root->GetChildByShellWindowId(shell_window_id));
     Add(container->aura_window());
 
     // Add any pre-existing windows in the container to
     // |disconnected_app_handler_|.
     for (aura::Window* child : container->aura_window()->children()) {
       if (!IsContainer(child))
         Add(child);
     }
   }
@@ skipping 12 matching lines @@
     Remove(params.target);
 
   if (params.new_parent == params.receiver && IsContainer(params.new_parent))
     Add(params.target);
 
   aura::WindowTracker::OnWindowHierarchyChanging(params);
 }
 
 }  // namespace mus
 }  // namespace ash