Removes WmShell::NewWindow()

ash/common/test/ash_test.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/common/test/ash_test.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/test/ash_test_impl.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/display/display.h"
 
 namespace ash {
 
 WindowOwner::WindowOwner(WmWindow* window) : window_(window) {}
 
 WindowOwner::~WindowOwner() {
   window_->Destroy();
 }
@@ skipping 34 matching lines @@
 std::unique_ptr<WindowOwner> AshTest::CreateToplevelTestWindow(
     const gfx::Rect& bounds_in_screen,
     int shell_window_id) {
   return test_impl_->CreateToplevelTestWindow(bounds_in_screen,
                                               shell_window_id);
 }
 
 std::unique_ptr<WindowOwner> AshTest::CreateChildWindow(WmWindow* parent,
                                                         const gfx::Rect& bounds,
                                                         int shell_window_id) {
+  aura::Window* window = new aura::Window(nullptr, ui::wm::WINDOW_TYPE_NORMAL);
+  window->Init(ui::LAYER_NOT_DRAWN);
   std::unique_ptr<WindowOwner> window_owner =
-      base::MakeUnique<WindowOwner>(WmShell::Get()->NewWindow(
-          ui::wm::WINDOW_TYPE_NORMAL, ui::LAYER_NOT_DRAWN));
-  window_owner->window()->SetBounds(bounds);
-  window_owner->window()->SetShellWindowId(shell_window_id);
-  parent->AddChild(window_owner->window());
-  window_owner->window()->Show();
+      base::MakeUnique<WindowOwner>(WmWindow::Get(window));
+  window->SetBounds(bounds);
+  window->set_id(shell_window_id);
+  parent->aura_window()->AddChild(window);
+  window->Show();
   return window_owner;
 }
 
 // static
 std::unique_ptr<views::Widget> AshTest::CreateTestWidget(
     const gfx::Rect& bounds,
     views::WidgetDelegate* delegate,
     int container_id) {
   std::unique_ptr<views::Widget> widget(new views::Widget);
   views::Widget::InitParams params;
@@ skipping 46 matching lines @@
 
 void AshTest::SetUp() {
   test_impl_->SetUp();
 }
 
 void AshTest::TearDown() {
   test_impl_->TearDown();
 }
 
 }  // namespace ash