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

Unified Diff: ash/display/display_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: address comments 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
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/extended_mouse_warp_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index e2762428ce3b5ae9661922149bb12b32e88f700d..fc1808130900c1b9e2ffc3ec12b13ba32c37a630 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1999,7 +1999,7 @@ TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
UpdateDisplay("400x500,300x200");
- scoped_ptr<aura::Window> docked(
+ std::unique_ptr<aura::Window> docked(
CreateTestWindowInShellWithBounds(gfx::Rect(10, 10, 50, 50)));
docked->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
ASSERT_TRUE(wm::GetWindowState(docked.get())->IsDocked());
@@ -2246,7 +2246,7 @@ TEST_F(DisplayManagerTest, RejectInvalidLayoutData) {
ASSERT_TRUE(CompareDisplayIds(id1, id2));
display::DisplayLayoutBuilder good_builder(id1);
good_builder.SetSecondaryPlacement(id2, display::DisplayPlacement::LEFT, 0);
- scoped_ptr<display::DisplayLayout> good(good_builder.Build());
+ std::unique_ptr<display::DisplayLayout> good(good_builder.Build());
display::DisplayIdList good_list = test::CreateDisplayIdList2(id1, id2);
layout_store->RegisterLayoutForDisplayIdList(good_list, good->Copy());
@@ -2267,7 +2267,8 @@ TEST_F(DisplayManagerTest, GuessDisplayIdFieldsInDisplayLayout) {
int64_t id1 = 10001;
int64_t id2 = 10002;
- scoped_ptr<display::DisplayLayout> old_layout(new display::DisplayLayout);
+ std::unique_ptr<display::DisplayLayout> old_layout(
+ new display::DisplayLayout);
old_layout->placement_list.emplace_back(display::DisplayPlacement::BOTTOM, 0);
old_layout->primary_id = id1;
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/extended_mouse_warp_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698