| Index: ui/display/manager/display_layout_builder_unittest.cc
|
| diff --git a/ui/display/manager/display_layout_builder_unittest.cc b/ui/display/manager/display_layout_builder_unittest.cc
|
| index 591a16cbd2925bf9b86809ac3d81f3fbfa7cd238..f632679fdb77ee632c0dc9993e3dc73b5610db38 100644
|
| --- a/ui/display/manager/display_layout_builder_unittest.cc
|
| +++ b/ui/display/manager/display_layout_builder_unittest.cc
|
| @@ -11,7 +11,7 @@ namespace display {
|
| TEST(DisplayLayoutBuilderTest, SecondaryPlacement) {
|
| DisplayLayoutBuilder builder(1);
|
| builder.SetSecondaryPlacement(2, DisplayPlacement::LEFT, 30);
|
| - scoped_ptr<DisplayLayout> layout(builder.Build());
|
| + std::unique_ptr<DisplayLayout> layout(builder.Build());
|
| ASSERT_EQ(1u, layout->placement_list.size());
|
|
|
| EXPECT_EQ(2, layout->placement_list[0].display_id);
|
| @@ -25,7 +25,7 @@ TEST(DisplayLayoutBuilderTest, MultiplePlacement) {
|
| builder.AddDisplayPlacement(5, 1, DisplayPlacement::TOP, 30);
|
| builder.AddDisplayPlacement(3, 5, DisplayPlacement::LEFT, 20);
|
| builder.AddDisplayPlacement(4, 5, DisplayPlacement::RIGHT, 10);
|
| - scoped_ptr<DisplayLayout> layout(builder.Build());
|
| + std::unique_ptr<DisplayLayout> layout(builder.Build());
|
|
|
| ASSERT_EQ(3u, layout->placement_list.size());
|
|
|
|
|