diff options
Diffstat (limited to 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index d0377a2..19166a0 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -48,10 +48,7 @@ TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) { scoped_ptr<FocusCycler> focus_cycler(new FocusCycler()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -78,10 +75,7 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -116,10 +110,7 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -154,10 +145,7 @@ TEST_F(FocusCyclerTest, CycleFocusForwardBackward) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -274,10 +262,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); @@ -308,10 +293,7 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusBackwardInvisible) { launcher->SetFocusCycler(focus_cycler.get()); // Create a single test window. - Window* default_container = Shell::GetInstance()->GetContainer( - Shell::GetPrimaryRootWindow(), - internal::kShellWindowId_DefaultContainer); - scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container)); + scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL)); wm::ActivateWindow(window0.get()); EXPECT_TRUE(wm::IsActiveWindow(window0.get())); |