Removes WmShell::NewWindow()

ash/common/shelf/shelf_window_watcher_unittest.cc

 // Copyright 2013 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/shelf/shelf_window_watcher.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/test/ash_test_base.h"
+#include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
  public:
   ShelfWindowWatcherTest() : model_(nullptr) {}
   ~ShelfWindowWatcherTest() override {}
 
   void SetUp() override {
@@ skipping 309 matching lines @@
   EXPECT_EQ(3, model_->item_count());
   widget2.reset();
   EXPECT_EQ(2, model_->item_count());
   widget1.reset();
   EXPECT_EQ(1, model_->item_count());
 }
 
 TEST_F(ShelfWindowWatcherTest, DontCreateShelfEntriesForChildWindows) {
   const int initial_item_count = model_->item_count();
 
-  WmWindow* window = WmShell::Get()->NewWindow(ui::wm::WINDOW_TYPE_NORMAL,
-                                               ui::LAYER_NOT_DRAWN);
-  window->aura_window()->SetProperty(kShelfItemTypeKey,
-                                     static_cast<int32_t>(TYPE_APP));
+  std::unique_ptr<aura::Window> window(
+      base::MakeUnique<aura::Window>(nullptr, ui::wm::WINDOW_TYPE_NORMAL));
+  window->Init(ui::LAYER_NOT_DRAWN);
+  window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_APP));
   WmShell::Get()
       ->GetPrimaryRootWindow()
       ->GetChildByShellWindowId(kShellWindowId_DefaultContainer)
-      ->AddChild(window);
+      ->AddChild(WmWindow::Get(window.get()));

[msw, 2017/03/08 21:38:24]

optional nit:
Shell::GetPrimaryRootWindow()->GetChildById(kShellWindowId_DefaultContainer)->AddChild(window);

[sky, 2017/03/08 22:58:17]

Done.

   window->Show();
   EXPECT_EQ(initial_item_count + 1, model_->item_count());
 
-  WmWindow* child_window = WmShell::Get()->NewWindow(ui::wm::WINDOW_TYPE_NORMAL,
-                                                     ui::LAYER_NOT_DRAWN);
-  child_window->aura_window()->SetProperty(kShelfItemTypeKey,
-                                           static_cast<int32_t>(TYPE_APP));
-  window->AddChild(child_window);
+  std::unique_ptr<aura::Window> child_window(
+      base::MakeUnique<aura::Window>(nullptr, ui::wm::WINDOW_TYPE_NORMAL));
+  child_window->Init(ui::LAYER_NOT_DRAWN);
+  child_window->SetProperty(kShelfItemTypeKey, static_cast<int32_t>(TYPE_APP));
+  window->AddChild(child_window.get());
   child_window->Show();
   // |child_window| should not result in adding a new entry.
   EXPECT_EQ(initial_item_count + 1, model_->item_count());
 
-  child_window->Destroy();
-  window->Destroy();
+  child_window.reset();
+  window.reset();
   EXPECT_EQ(initial_item_count, model_->item_count());
 }
 
 // Ensures ShelfWindowWatcher supports windows opened prior to session start.
 using ShelfWindowWatcherSessionStartTest = test::NoSessionAshTestBase;
 TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) {
   ShelfModel* model = WmShell::Get()->shelf_model();
   ASSERT_FALSE(
       WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted());
 
   // ShelfModel only has an APP_LIST item.
   EXPECT_EQ(1, model->item_count());
 
   // Construct a window that should get a shelf item once the session starts.
   std::unique_ptr<views::Widget> widget =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
   ShelfWindowWatcherTest::CreateShelfItem(window);
   EXPECT_EQ(1, model->item_count());
 
   // Start the test user session; ShelfWindowWatcher will find the open window.
   SetSessionStarted(true);
   EXPECT_EQ(2, model->item_count());
 }
 
 }  // namespace ash