Makes functions in container_finder take aura::Window

ash/wm/stacking_controller.cc

Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 6dfa6086064f451fe089374e35fa28811c53f027..27c8a5620d6f22904cf594554f2519ad6b6efef9 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -5,7 +5,7 @@
 #include "ash/wm/stacking_controller.h"
 
 #include "ash/wm/container_finder.h"
-#include "ash/wm_window.h"
+#include "ui/aura/window.h"
 
 namespace ash {
 
@@ -21,8 +21,7 @@ StackingController::~StackingController() {}
 
 aura::Window* StackingController::GetDefaultParent(aura::Window* window,
                                                    const gfx::Rect& bounds) {
-  return WmWindow::GetAuraWindow(
-      wm::GetDefaultParent(WmWindow::Get(window), bounds));
+  return wm::GetDefaultParent(window, bounds);
 }
 
 }  // namespace ash