Index: ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc |
diff --git a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc |
index be01a8ffe905d5d0e1f4bdd1ace05943884f27d8..478425fa6d066262368dd9857184e48485f12ce4 100644 |
--- a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc |
+++ b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc |
@@ -40,8 +40,8 @@ |
namespace ash { |
namespace { |
-WorkspaceLayoutManager* GetWorkspaceLayoutManager(WmWindow* container) { |
- return static_cast<WorkspaceLayoutManager*>(container->GetLayoutManager()); |
+WorkspaceLayoutManager* GetWorkspaceLayoutManager(aura::Window* container) { |
+ return static_cast<WorkspaceLayoutManager*>(container->layout_manager()); |
} |
} // namespace |
@@ -54,8 +54,8 @@ class WorkspaceLayoutManagerKeyboardTest2 : public test::AshTestBase { |
void SetUp() override { |
test::AshTestBase::SetUp(); |
UpdateDisplay("800x600"); |
- WmWindow* default_container = |
- ShellPort::Get()->GetPrimaryRootWindowController()->GetWmContainer( |
+ aura::Window* default_container = |
+ Shell::GetPrimaryRootWindowController()->GetContainer( |
kShellWindowId_DefaultContainer); |
layout_manager_ = GetWorkspaceLayoutManager(default_container); |
} |