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

Unified Diff: ash/display/json_converter_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/json_converter.cc ('k') | ash/display/mouse_cursor_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/json_converter_unittest.cc
diff --git a/ash/display/json_converter_unittest.cc b/ash/display/json_converter_unittest.cc
index 3c964d021f0c2ea8c7591b8c8faddd933d3b7d65..0ac13d84dffff56b9d38271c7528648c79fb43ab 100644
--- a/ash/display/json_converter_unittest.cc
+++ b/ash/display/json_converter_unittest.cc
@@ -16,16 +16,16 @@ TEST(JsonConverterTest, JsonFromToDisplayLayout) {
layout.primary_id = 1;
layout.mirrored = true;
layout.default_unified = false;
- layout.placement_list.push_back(new DisplayPlacement);
- layout.placement_list.push_back(new DisplayPlacement);
- layout.placement_list[0]->display_id = 2;
- layout.placement_list[0]->parent_display_id = 1;
- layout.placement_list[0]->position = DisplayPlacement::BOTTOM;
+ layout.placement_list.push_back(DisplayPlacement());
+ layout.placement_list.push_back(DisplayPlacement());
+ layout.placement_list[0].display_id = 2;
+ layout.placement_list[0].parent_display_id = 1;
+ layout.placement_list[0].position = DisplayPlacement::BOTTOM;
- layout.placement_list[1]->display_id = 3;
- layout.placement_list[1]->parent_display_id = 2;
- layout.placement_list[1]->position = DisplayPlacement::LEFT;
- layout.placement_list[1]->offset = 30;
+ layout.placement_list[1].display_id = 3;
+ layout.placement_list[1].parent_display_id = 2;
+ layout.placement_list[1].position = DisplayPlacement::LEFT;
+ layout.placement_list[1].offset = 30;
base::DictionaryValue value;
DisplayLayoutToJson(layout, &value);
@@ -85,8 +85,8 @@ TEST(JsonConverterTest, OldJsonToDisplayLayout) {
EXPECT_EQ(1, read_layout.primary_id);
EXPECT_EQ(false, read_layout.default_unified);
ASSERT_EQ(1u, read_layout.placement_list.size());
- EXPECT_EQ(DisplayPlacement::BOTTOM, read_layout.placement_list[0]->position);
- EXPECT_EQ(20, read_layout.placement_list[0]->offset);
+ EXPECT_EQ(DisplayPlacement::BOTTOM, read_layout.placement_list[0].position);
+ EXPECT_EQ(20, read_layout.placement_list[0].offset);
}
} // namespace ash
« no previous file with comments | « ash/display/json_converter.cc ('k') | ash/display/mouse_cursor_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698