Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3304)

Unified Diff: ash/display/window_tree_host_manager_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698