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

Side by Side Diff: ui/display/manager/display_layout_builder_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 unified diff | Download patch
« no previous file with comments | « ui/display/manager/display_layout_builder.cc ('k') | ui/display/util/edid_parser_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/display/manager/display_layout_builder.h" 5 #include "ui/display/manager/display_layout_builder.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace display { 9 namespace display {
10 10
11 TEST(DisplayLayoutBuilderTest, SecondaryPlacement) { 11 TEST(DisplayLayoutBuilderTest, SecondaryPlacement) {
12 DisplayLayoutBuilder builder(1); 12 DisplayLayoutBuilder builder(1);
13 builder.SetSecondaryPlacement(2, DisplayPlacement::LEFT, 30); 13 builder.SetSecondaryPlacement(2, DisplayPlacement::LEFT, 30);
14 scoped_ptr<DisplayLayout> layout(builder.Build()); 14 std::unique_ptr<DisplayLayout> layout(builder.Build());
15 ASSERT_EQ(1u, layout->placement_list.size()); 15 ASSERT_EQ(1u, layout->placement_list.size());
16 16
17 EXPECT_EQ(2, layout->placement_list[0].display_id); 17 EXPECT_EQ(2, layout->placement_list[0].display_id);
18 EXPECT_EQ(1, layout->placement_list[0].parent_display_id); 18 EXPECT_EQ(1, layout->placement_list[0].parent_display_id);
19 EXPECT_EQ(30, layout->placement_list[0].offset); 19 EXPECT_EQ(30, layout->placement_list[0].offset);
20 EXPECT_EQ(DisplayPlacement::LEFT, layout->placement_list[0].position); 20 EXPECT_EQ(DisplayPlacement::LEFT, layout->placement_list[0].position);
21 } 21 }
22 22
23 TEST(DisplayLayoutBuilderTest, MultiplePlacement) { 23 TEST(DisplayLayoutBuilderTest, MultiplePlacement) {
24 DisplayLayoutBuilder builder(1); 24 DisplayLayoutBuilder builder(1);
25 builder.AddDisplayPlacement(5, 1, DisplayPlacement::TOP, 30); 25 builder.AddDisplayPlacement(5, 1, DisplayPlacement::TOP, 30);
26 builder.AddDisplayPlacement(3, 5, DisplayPlacement::LEFT, 20); 26 builder.AddDisplayPlacement(3, 5, DisplayPlacement::LEFT, 20);
27 builder.AddDisplayPlacement(4, 5, DisplayPlacement::RIGHT, 10); 27 builder.AddDisplayPlacement(4, 5, DisplayPlacement::RIGHT, 10);
28 scoped_ptr<DisplayLayout> layout(builder.Build()); 28 std::unique_ptr<DisplayLayout> layout(builder.Build());
29 29
30 ASSERT_EQ(3u, layout->placement_list.size()); 30 ASSERT_EQ(3u, layout->placement_list.size());
31 31
32 // placmenets are sorted by display_id. 32 // placmenets are sorted by display_id.
33 EXPECT_EQ(3, layout->placement_list[0].display_id); 33 EXPECT_EQ(3, layout->placement_list[0].display_id);
34 EXPECT_EQ(5, layout->placement_list[0].parent_display_id); 34 EXPECT_EQ(5, layout->placement_list[0].parent_display_id);
35 EXPECT_EQ(20, layout->placement_list[0].offset); 35 EXPECT_EQ(20, layout->placement_list[0].offset);
36 EXPECT_EQ(DisplayPlacement::LEFT, layout->placement_list[0].position); 36 EXPECT_EQ(DisplayPlacement::LEFT, layout->placement_list[0].position);
37 37
38 EXPECT_EQ(4, layout->placement_list[1].display_id); 38 EXPECT_EQ(4, layout->placement_list[1].display_id);
39 EXPECT_EQ(5, layout->placement_list[1].parent_display_id); 39 EXPECT_EQ(5, layout->placement_list[1].parent_display_id);
40 EXPECT_EQ(10, layout->placement_list[1].offset); 40 EXPECT_EQ(10, layout->placement_list[1].offset);
41 EXPECT_EQ(DisplayPlacement::RIGHT, layout->placement_list[1].position); 41 EXPECT_EQ(DisplayPlacement::RIGHT, layout->placement_list[1].position);
42 42
43 EXPECT_EQ(5, layout->placement_list[2].display_id); 43 EXPECT_EQ(5, layout->placement_list[2].display_id);
44 EXPECT_EQ(1, layout->placement_list[2].parent_display_id); 44 EXPECT_EQ(1, layout->placement_list[2].parent_display_id);
45 EXPECT_EQ(30, layout->placement_list[2].offset); 45 EXPECT_EQ(30, layout->placement_list[2].offset);
46 EXPECT_EQ(DisplayPlacement::TOP, layout->placement_list[2].position); 46 EXPECT_EQ(DisplayPlacement::TOP, layout->placement_list[2].position);
47 } 47 }
48 48
49 } // namespace display 49 } // namespace display
OLDNEW
« no previous file with comments | « ui/display/manager/display_layout_builder.cc ('k') | ui/display/util/edid_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698