Index: ash/display/window_tree_host_manager_unittest.cc |
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc |
index faa8f4d3168707adbd8e880aee8a288978758ab1..1592f14bb323dbf730de241ff971d351954a581c 100644 |
--- a/ash/display/window_tree_host_manager_unittest.cc |
+++ b/ash/display/window_tree_host_manager_unittest.cc |
@@ -187,7 +187,7 @@ gfx::Display GetSecondaryDisplay() { |
void SetSecondaryDisplayLayoutAndOffset( |
display::DisplayPlacement::Position position, |
int offset) { |
- scoped_ptr<display::DisplayLayout> layout( |
+ std::unique_ptr<display::DisplayLayout> layout( |
test::CreateDisplayLayout(position, offset)); |
ASSERT_GT(gfx::Screen::GetScreen()->GetNumDisplays(), 1); |
Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays( |
@@ -396,7 +396,7 @@ TEST_F(WindowTreeHostManagerTest, SecondaryDisplayLayout) { |
return; |
// Creates windows to catch activation change event. |
- scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
+ std::unique_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
w1->Focus(); |
TestObserver observer; |
@@ -558,7 +558,7 @@ TEST_F(WindowTreeHostManagerTest, MirrorToDockedWithFullscreen) { |
return; |
// Creates windows to catch activation change event. |
- scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
+ std::unique_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
w1->Focus(); |
// Docked mode. |
@@ -608,7 +608,7 @@ TEST_F(WindowTreeHostManagerTest, BoundsUpdated) { |
return; |
// Creates windows to catch activation change event. |
- scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
+ std::unique_ptr<aura::Window> w1(CreateTestWindowInShellWithId(1)); |
w1->Focus(); |
TestObserver observer; |