Removes a couple more functions from WmWindow

ash/mus/test/ash_test_impl_mus.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/mus/test/ash_test_impl_mus.h"
 
 #include "ash/test/ash_test.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
+#include "ui/aura/window.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 // WmTestBase is abstract as TestBody() is pure virtual (the various TEST
 // macros have the implementation). In order to create WmTestBase we have to
 // subclass with an empty implementation of TestBody(). That's ok as the class
 // isn't used as a normal test here.
@@ skipping 25 matching lines @@
 }
 
 void AshTestImplMus::UpdateDisplay(const std::string& display_spec) {
   wm_test_base_->UpdateDisplay(display_spec);
 }
 
 std::unique_ptr<WindowOwner> AshTestImplMus::CreateTestWindow(
     const gfx::Rect& bounds_in_screen,
     ui::wm::WindowType type,
     int shell_window_id) {
-  WmWindow* window =
-      WmWindow::Get(wm_test_base_->CreateTestWindow(bounds_in_screen, type));
-  window->SetShellWindowId(shell_window_id);
-  return base::MakeUnique<WindowOwner>(window);
+  aura::Window* window =
+      wm_test_base_->CreateTestWindow(bounds_in_screen, type);
+  window->set_id(shell_window_id);
+  return base::MakeUnique<WindowOwner>(WmWindow::Get(window));
 }
 
 std::unique_ptr<WindowOwner> AshTestImplMus::CreateToplevelTestWindow(
     const gfx::Rect& bounds_in_screen,
     int shell_window_id) {
   // For mus CreateTestWindow() creates top level windows (assuming
   // WINDOW_TYPE_NORMAL).
   return CreateTestWindow(bounds_in_screen, ui::wm::WINDOW_TYPE_NORMAL,
                           shell_window_id);
 }
@@ skipping 20 matching lines @@
 }
 
 void AshTestImplMus::AddTransientChild(WmWindow* parent, WmWindow* window) {
   // TODO(sky): remove this as both classes can share same implementation now.
   ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent),
                           WmWindow::GetAuraWindow(window));
 }
 
 }  // namespace mus
 }  // namespace ash