Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/always_on_top_controller_unittest.cc

Index: ash/wm/always_on_top_controller_unittest.cc
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc
index 2766f363f4752f2d0d941be231411e12939bfbe4..54d63edc019afbb5324b26c577b1027b2298ffd3 100644
--- a/ash/wm/always_on_top_controller_unittest.cc
+++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -8,9 +8,11 @@
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_ui.h"
@@ -36,7 +38,7 @@ class VirtualKeyboardAlwaysOnTopControllerTest : public AshTestBase {
 
 class TestLayoutManager : public WorkspaceLayoutManager {
  public:
-  explicit TestLayoutManager(aura::Window* window)
+  explicit TestLayoutManager(wm::WmWindow* window)
       : WorkspaceLayoutManager(window, nullptr),
         keyboard_bounds_changed_(false) {}
 
@@ -63,11 +65,12 @@ TEST_F(VirtualKeyboardAlwaysOnTopControllerTest, NotifyKeyboardBoundsChanged) {
   aura::Window* always_on_top_container =
       Shell::GetContainer(root_window, kShellWindowId_AlwaysOnTopContainer);
   // Install test layout manager.
-  TestLayoutManager* manager = new TestLayoutManager(always_on_top_container);
+  TestLayoutManager* manager =
+      new TestLayoutManager(wm::WmWindowAura::Get(always_on_top_container));
   RootWindowController* controller = Shell::GetPrimaryRootWindowController();
   AlwaysOnTopController* always_on_top_controller =
       controller->always_on_top_controller();
-  always_on_top_controller->SetLayoutManagerForTest(manager);
+  always_on_top_controller->SetLayoutManagerForTest(base::WrapUnique(manager));
   // Activate keyboard. This triggers keyboard listeners to be registered.
   controller->ActivateKeyboard(keyboard_controller);