Makes functions in container_finder take aura::Window

ash/mus/top_level_window_factory.cc

 // Copyright 2017 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/top_level_window_factory.h"
 
 #include "ash/mus/disconnected_app_handler.h"
 #include "ash/mus/frame/detached_title_area_renderer.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
@@ skipping 169 matching lines @@
     container_window->AddChild(window);
   } else {
     WmWindow* root = root_window_controller->GetWindow();
     gfx::Point origin =
         root->ConvertPointToTarget(root->GetRootWindow(), gfx::Point());
     origin += root_window_controller->GetWindow()
                   ->GetDisplayNearestWindow()
                   .bounds()
                   .OffsetFromOrigin();
     gfx::Rect bounds_in_screen(origin, bounds.size());
-    ash::wm::GetDefaultParent(WmWindow::Get(window), bounds_in_screen)
-        ->aura_window()
-        ->AddChild(window);
+    ash::wm::GetDefaultParent(window, bounds_in_screen)->AddChild(window);
   }
   return window;
 }
 
 }  // namespace
 
 aura::Window* CreateAndParentTopLevelWindow(
     WindowManager* window_manager,
     ui::mojom::WindowType window_type,
     std::map<std::string, std::vector<uint8_t>>* properties) {
@@ skipping 23 matching lines @@
     if (non_client_frame_controller)
       non_client_frame_controller->set_can_activate(can_focus);
     // No need to persist this value.
     properties->erase(focusable_iter);
   }
   return window;
 }
 
 }  // namespace mus
 }  // namespace ash