[mus+ash] Removes WmWindow from window_positioning_utils

components/exo/test/exo_test_helper.cc

 // Copyright 2015 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 "components/exo/test/exo_test_helper.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_positioning_utils.h"
-#include "ash/wm_window.h"
 #include "components/exo/buffer.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/surface.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/compositor.h"
 #include "ui/views/widget/widget.h"
 
 namespace exo {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExoTestHelper, public:
 
 ExoTestWindow::ExoTestWindow(std::unique_ptr<gfx::GpuMemoryBuffer> gpu_buffer,
                              bool is_modal) {
   surface_.reset(new Surface());
   int container = is_modal ? ash::kShellWindowId_SystemModalContainer
                            : ash::kShellWindowId_DefaultContainer;
   shell_surface_.reset(new ShellSurface(surface_.get(), nullptr,
                                         ShellSurface::BoundsMode::SHELL,
                                         gfx::Point(), true, false, container));
 
   buffer_.reset(new Buffer(std::move(gpu_buffer)));
   surface_->Attach(buffer_.get());
   surface_->Commit();
 
-  ash::wm::CenterWindow(
-      ash::WmWindow::Get(shell_surface_->GetWidget()->GetNativeWindow()));
+  ash::wm::CenterWindow(shell_surface_->GetWidget()->GetNativeWindow());
 }
 
 ExoTestWindow::ExoTestWindow(ExoTestWindow&& other) {
   surface_ = std::move(other.surface_);
   buffer_ = std::move(other.buffer_);
   shell_surface_ = std::move(other.shell_surface_);
 }
 
 ExoTestWindow::~ExoTestWindow() {}
 
@@ skipping 22 matching lines @@
 
 ExoTestWindow ExoTestHelper::CreateWindow(int width,
                                           int height,
                                           bool is_modal) {
   return ExoTestWindow(CreateGpuMemoryBuffer(gfx::Size(width, height)),
                        is_modal);
 }
 
 }  // namespace test
 }  // namespace exo