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

Unified Diff: ash/display/display_manager_unittest.cc

Issue 1819533002: Convert ScopedVector<DisplayPlacement> to std::vector<DisplayPlacement> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jsonrefactor
Patch Set: Created 4 years, 9 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.cc » ('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 3424058c4a2715012f518b9003b8034f3b93f789..9be39e9b6768987546983d32a228222e979dd495 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -2203,8 +2203,7 @@ TEST_F(DisplayManagerTest, GuessDisplayIdFieldsInDisplayLayout) {
int64_t id2 = 10002;
scoped_ptr<DisplayLayout> old_layout(new DisplayLayout);
- old_layout->placement_list.push_back(
- new DisplayPlacement(DisplayPlacement::BOTTOM, 0));
+ old_layout->placement_list.emplace_back(DisplayPlacement::BOTTOM, 0);
old_layout->primary_id = id1;
DisplayLayoutStore* layout_store = display_manager()->layout_store();
@@ -2212,8 +2211,8 @@ TEST_F(DisplayManagerTest, GuessDisplayIdFieldsInDisplayLayout) {
layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout));
const DisplayLayout& stored = layout_store->GetRegisteredDisplayLayout(list);
- EXPECT_EQ(id1, stored.placement_list[0]->parent_display_id);
- EXPECT_EQ(id2, stored.placement_list[0]->display_id);
+ EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
+ EXPECT_EQ(id2, stored.placement_list[0].display_id);
}
#endif // OS_CHROMEOS
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/extended_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698