| Index: ash/display/extended_mouse_warp_controller_unittest.cc
|
| diff --git a/ash/display/extended_mouse_warp_controller_unittest.cc b/ash/display/extended_mouse_warp_controller_unittest.cc
|
| index 20aef5b199a6c85fd199bb33a2bf931fa70acc4a..2b52ad91e2543be76fc84010c5870ccd1b652d3e 100644
|
| --- a/ash/display/extended_mouse_warp_controller_unittest.cc
|
| +++ b/ash/display/extended_mouse_warp_controller_unittest.cc
|
| @@ -62,7 +62,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnRight) {
|
| gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
|
|
|
| DisplayManager* display_manager = Shell::GetInstance()->display_manager();
|
| - scoped_ptr<display::DisplayLayout> layout(
|
| + std::unique_ptr<display::DisplayLayout> layout(
|
| test::CreateDisplayLayout(display::DisplayPlacement::RIGHT, 0));
|
|
|
| display_manager->SetLayoutForCurrentDisplays(layout->Copy());
|
| @@ -134,7 +134,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnLeft) {
|
| gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
|
|
|
| DisplayManager* display_manager = Shell::GetInstance()->display_manager();
|
| - scoped_ptr<display::DisplayLayout> layout(
|
| + std::unique_ptr<display::DisplayLayout> layout(
|
| test::CreateDisplayLayout(display::DisplayPlacement::LEFT, 0));
|
| display_manager->SetLayoutForCurrentDisplays(layout->Copy());
|
|
|
| @@ -175,7 +175,7 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestOnTopBottom) {
|
| gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_windows[1]).id();
|
|
|
| DisplayManager* display_manager = Shell::GetInstance()->display_manager();
|
| - scoped_ptr<display::DisplayLayout> layout(
|
| + std::unique_ptr<display::DisplayLayout> layout(
|
| test::CreateDisplayLayout(display::DisplayPlacement::TOP, 0));
|
| display_manager->SetLayoutForCurrentDisplays(layout->Copy());
|
| event_filter()->ShowSharedEdgeIndicator(root_windows[0] /* primary */);
|
|
|