Index: ash/wm/workspace/workspace_layout_manager_unittest.cc |
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc |
index 8dcf3a5f31396e77ca9311d998a796775c66f618..76c7b241d8f38b4407839e1e3a827b38b03b43c1 100644 |
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc |
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc |
@@ -523,8 +523,7 @@ TEST_F(WorkspaceLayoutManagerTest, NotifyFullscreenChanges) { |
EXPECT_FALSE(observer.is_fullscreen()); |
} |
-// Following tests were originally written for BaseLayoutManager. |
- |
+// Following "Solo" tests were originally written for BaseLayoutManager. |
namespace { |
class WorkspaceLayoutManagerSoloTest : public test::AshTestBase { |
@@ -532,15 +531,6 @@ class WorkspaceLayoutManagerSoloTest : public test::AshTestBase { |
WorkspaceLayoutManagerSoloTest() {} |
virtual ~WorkspaceLayoutManagerSoloTest() {} |
- virtual void SetUp() OVERRIDE { |
- test::AshTestBase::SetUp(); |
- UpdateDisplay("800x600"); |
- aura::Window* default_container = Shell::GetContainer( |
- Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer); |
- default_container->SetLayoutManager( |
- new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow())); |
- } |
- |
aura::Window* CreateTestWindow(const gfx::Rect& bounds) { |
return CreateTestWindowInShellWithBounds(bounds); |
} |
@@ -993,8 +983,8 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase { |
UpdateDisplay("800x600"); |
aura::Window* default_container = Shell::GetContainer( |
Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer); |
- layout_manager_ = new WorkspaceLayoutManager(Shell::GetPrimaryRootWindow()); |
- default_container->SetLayoutManager(layout_manager_); |
+ layout_manager_ = static_cast<WorkspaceLayoutManager*>( |
+ default_container->layout_manager()); |
} |
aura::Window* CreateTestWindow(const gfx::Rect& bounds) { |