| Index: ash/wm/drag_window_resizer_unittest.cc
|
| diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
|
| index c0514a7cea160c9a856ec0cb80ef37ea17417c84..410022bdffaf6bb29d1bcd7d19ad3874d83f419d 100644
|
| --- a/ash/wm/drag_window_resizer_unittest.cc
|
| +++ b/ash/wm/drag_window_resizer_unittest.cc
|
| @@ -306,10 +306,10 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
|
| window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
|
| display::Screen::GetScreen()->GetPrimaryDisplay());
|
| window->Show();
|
| - EXPECT_TRUE(ash::wm::CanActivateWindow(window.get()));
|
| - ash::wm::ActivateWindow(window.get());
|
| + EXPECT_TRUE(wm::CanActivateWindow(window.get()));
|
| + wm::ActivateWindow(window.get());
|
| EXPECT_EQ(root_windows[0], window->GetRootWindow());
|
| - EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
|
| + EXPECT_EQ(root_windows[0], Shell::GetRootWindowForNewWindows());
|
| {
|
| // Grab (0, 0) of the window.
|
| std::unique_ptr<WindowResizer> resizer(
|
| @@ -322,7 +322,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
|
| // The whole window is on the secondary display now. The parent should be
|
| // changed.
|
| EXPECT_EQ(root_windows[1], window->GetRootWindow());
|
| - EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
|
| + EXPECT_EQ(root_windows[1], Shell::GetRootWindowForNewWindows());
|
| }
|
| }
|
|
|
|
|