Move DisplayList to display; add ScreenBase.

ui/display/manager/display_layout_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/display.h"
 
 #include <tuple>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_layout_builder.h"
 
 namespace display {
 
 TEST(DisplayLayoutTest, Empty) {
-  DisplayList display_list;
+  Displays display_list;
   std::vector<int64_t> updated_ids;
 
   DisplayLayout display_layout;
   display_layout.ApplyToDisplayList(&display_list, &updated_ids, 0);
 
   EXPECT_EQ(0u, updated_ids.size());
   EXPECT_EQ(0u, display_list.size());
 }
 
 TEST(DisplayLayoutTest, SingleDisplayNoPlacements) {
-  DisplayList display_list;
+  Displays display_list;
   display_list.emplace_back(0, gfx::Rect(0, 0, 800, 600));
   std::vector<int64_t> updated_ids;
 
   DisplayLayout display_layout;
   display_layout.ApplyToDisplayList(&display_list, &updated_ids, 0);
 
   EXPECT_EQ(0u, updated_ids.size());
   ASSERT_EQ(1u, display_list.size());
   EXPECT_EQ(gfx::Rect(0, 0, 800, 600), display_list[0].bounds());
 }
 
 TEST(DisplayLayoutTest, SingleDisplayNonRelevantPlacement) {
-  DisplayList display_list;
+  Displays display_list;
   display_list.emplace_back(0, gfx::Rect(0, 0, 800, 600));
   std::vector<int64_t> updated_ids;
 
   DisplayLayoutBuilder builder(20);
   builder.AddDisplayPlacement(20, 40, DisplayPlacement::Position::LEFT, 150);
   std::unique_ptr<DisplayLayout> display_layout(builder.Build());
   display_layout->ApplyToDisplayList(&display_list, &updated_ids, 0);
 
   EXPECT_EQ(0u, updated_ids.size());
   ASSERT_EQ(1u, display_list.size());
@@ skipping 29 matching lines @@
 
 TEST_P(TwoDisplays, Placement) {
   gfx::Rect primary_display_bounds = std::get<0>(GetParam());
   gfx::Rect secondary_display_bounds = std::get<1>(GetParam());
   DisplayPlacement::Position position = std::get<2>(GetParam());
   int offset = std::get<3>(GetParam());
   int minimum_offset_overlap = std::get<4>(GetParam());
   gfx::Rect expected_primary_display_bounds = std::get<5>(GetParam());
   gfx::Rect expected_secondary_display_bounds = std::get<6>(GetParam());
 
-  DisplayList display_list;
+  Displays display_list;
   display_list.emplace_back(0, primary_display_bounds);
   display_list.emplace_back(1, secondary_display_bounds);
   std::vector<int64_t> updated_ids;
 
   DisplayLayoutBuilder builder(0);
   builder.AddDisplayPlacement(1, 0, position, offset);
   std::unique_ptr<DisplayLayout> display_layout(builder.Build());
   display_layout->ApplyToDisplayList(
       &display_list, &updated_ids, minimum_offset_overlap);
 
@@ skipping 153 matching lines @@
         std::make_tuple(
             gfx::Rect(0, 0, 20, 40), gfx::Rect(0, 0, 30, 60),
             DisplayPlacement::Position::BOTTOM, -30, 14,
             gfx::Rect(0, 0, 20, 40), gfx::Rect(-16, 40, 30, 60))));
 
 // Display Layout
 //     [1]  [4]
 //    [0][3]   [6]
 // [2]  [5]
 TEST(DisplayLayoutTest, MultipleDisplays) {
-  DisplayList display_list;
+  Displays display_list;
   display_list.emplace_back(0, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(1, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(2, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(3, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(4, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(5, gfx::Rect(0, 0, 100, 100));
   display_list.emplace_back(6, gfx::Rect(0, 0, 100, 100));
   std::vector<int64_t> updated_ids;
 
   DisplayLayoutBuilder builder(0);
@@ skipping 52 matching lines @@
 
 TEST_P(TwoDisplaysBottomRightReference, Placement) {
   gfx::Rect primary_display_bounds = std::get<0>(GetParam());
   gfx::Rect secondary_display_bounds = std::get<1>(GetParam());
   DisplayPlacement::Position position = std::get<2>(GetParam());
   int offset = std::get<3>(GetParam());
   int minimum_offset_overlap = std::get<4>(GetParam());
   gfx::Rect expected_primary_display_bounds = std::get<5>(GetParam());
   gfx::Rect expected_secondary_display_bounds = std::get<6>(GetParam());
 
-  DisplayList display_list;
+  Displays display_list;
   display_list.emplace_back(0, primary_display_bounds);
   display_list.emplace_back(1, secondary_display_bounds);
   std::vector<int64_t> updated_ids;
 
   DisplayLayoutBuilder builder(0);
   DisplayPlacement placement;
   placement.display_id = 1;
   placement.parent_display_id = 0;
   placement.position = position;
   placement.offset = offset;
@@ skipping 42 matching lines @@
         std::make_tuple(
             gfx::Rect(0, 0, 800, 600), gfx::Rect(0, 0, 1024, 768),
             DisplayPlacement::Position::RIGHT, 7, 0,
             gfx::Rect(0, 0, 800, 600), gfx::Rect(800, -175, 1024, 768)),
         std::make_tuple(
             gfx::Rect(0, 0, 800, 600), gfx::Rect(0, 0, 1024, 768),
             DisplayPlacement::Position::BOTTOM, 7, 0,
             gfx::Rect(0, 0, 800, 600), gfx::Rect(-231, 600, 1024, 768))));
 
 }  // namespace display