Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/mus/non_client_frame_controller.cc

Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 784bd44190c46f2660f413f5f00139240d3d47d4..d19ede266458ec64e37b51a915be081c04dcc8b8 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -10,11 +10,11 @@
 #include <string>
 #include <vector>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/common/wm/panels/panel_frame_view.h"
-#include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/frame/custom_frame_view_mus.h"
 #include "ash/mus/frame/detached_title_area_renderer.h"
 #include "ash/mus/move_event_handler.h"
@@ -121,7 +121,7 @@ class ImmersiveFullscreenControllerDelegateMus
     // DCHECK is to ensure when parent changes this code is updated.
     // http://crbug.com/640392.
     DCHECK_EQ(frame_window_->parent(), title_area_window->parent());
-    result.push_back(WmWindowMus::Get(title_area_window)
+    result.push_back(ash::WmWindowAura::Get(title_area_window)
                          ->ConvertRectToScreen(visible_bounds));
     return result;
   }
@@ -330,7 +330,7 @@ NonClientFrameController::NonClientFrameController(
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
-  WmWindowMus* wm_window = WmWindowMus::Get(window_);
+  ash::WmWindowAura* wm_window = ash::WmWindowAura::Get(window_);
   const gfx::Insets extended_hit_region =
       wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
                                               : gfx::Insets();
@@ -394,15 +394,15 @@ base::string16 NonClientFrameController::GetWindowTitle() const {
 }
 
 bool NonClientFrameController::CanResize() const {
-  return window_ && WmWindowMus::Get(window_)->CanResize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanResize();
 }
 
 bool NonClientFrameController::CanMaximize() const {
-  return window_ && WmWindowMus::Get(window_)->CanMaximize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanMaximize();
 }
 
 bool NonClientFrameController::CanMinimize() const {
-  return window_ && WmWindowMus::Get(window_)->CanMinimize();
+  return window_ && ash::WmWindowAura::Get(window_)->CanMinimize();
 }
 
 bool NonClientFrameController::ShouldShowWindowTitle() const {