| Index: ash/display/screen_position_controller_unittest.cc
|
| diff --git a/ash/display/screen_position_controller_unittest.cc b/ash/display/screen_position_controller_unittest.cc
|
| index a4eeca655fa44b57a5cfb2d82dc5ea60b056b339..0ea3007e8351b053eb880d4627b485df6c875932 100644
|
| --- a/ash/display/screen_position_controller_unittest.cc
|
| +++ b/ash/display/screen_position_controller_unittest.cc
|
| @@ -43,10 +43,10 @@ namespace test {
|
| namespace {
|
|
|
| void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
|
| - scoped_ptr<display::DisplayLayout> layout(Shell::GetInstance()
|
| - ->display_manager()
|
| - ->GetCurrentDisplayLayout()
|
| - .Copy());
|
| + std::unique_ptr<display::DisplayLayout> layout(Shell::GetInstance()
|
| + ->display_manager()
|
| + ->GetCurrentDisplayLayout()
|
| + .Copy());
|
| layout->placement_list[0].position = position;
|
| Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
|
| std::move(layout));
|
| @@ -86,7 +86,7 @@ class ScreenPositionControllerTest : public test::AshTestBase {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<aura::Window> window_;
|
| + std::unique_ptr<aura::Window> window_;
|
| aura::test::TestWindowDelegate window_delegate_;
|
|
|
| private:
|
| @@ -341,7 +341,7 @@ TEST_F(ScreenPositionControllerTest,
|
| Shell::GetInstance()->GetAllRootWindows();
|
| aura::WindowTracker tracker;
|
| tracker.Add(root_windows[1]);
|
| - scoped_ptr<ConvertToScreenEventHandler> event_handler(
|
| + std::unique_ptr<ConvertToScreenEventHandler> event_handler(
|
| new ConvertToScreenEventHandler);
|
|
|
| // Remove the secondary monitor.
|
|
|