Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/display/display_util_unittest.cc

 // Copyright 2014 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 "ash/display/display_util.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
@@ skipping 74 matching lines @@
     AshWindowTreeHost* host1 =
         GetRootWindowController(root_windows[1])->ash_host();
     gfx::Rect rect0 = GetNativeEdgeBounds(host0, gfx::Rect(499, 10, 1, 300));
     gfx::Rect rect1 = GetNativeEdgeBounds(host1, gfx::Rect(500, 10, 1, 300));
     EXPECT_EQ("10,99 1x300", rect0.ToString());
     EXPECT_EQ("600,20 1x300", rect1.ToString());
   }
 }
 
 TEST_F(DisplayUtilTest, GenerateDisplayIdList) {
-  DisplayIdList list;
+  display::DisplayIdList list;
   {
     int64_t ids[] = {10, 1};
     list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
     EXPECT_EQ(1, list[0]);
     EXPECT_EQ(10, list[1]);
 
     int64_t three_ids[] = {10, 5, 1};
     list = GenerateDisplayIdList(std::begin(three_ids), std::end(three_ids));
     ASSERT_EQ(3u, list.size());
     EXPECT_EQ(1, list[0]);
@@ skipping 49 matching lines @@
     ASSERT_EQ(3u, list.size());
     EXPECT_EQ(10, list[0]);
     EXPECT_EQ(100, list[1]);
     EXPECT_EQ(1000, list[2]);
   }
 }
 
 TEST_F(DisplayUtilTest, DisplayIdListToString) {
   {
     int64_t ids[] = {10, 1, 16};
-    DisplayIdList list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    display::DisplayIdList list =
+        GenerateDisplayIdList(std::begin(ids), std::end(ids));
     EXPECT_EQ("1,10,16", DisplayIdListToString(list));
   }
   {
     test::ScopedSetInternalDisplayId set_internal(16);
     int64_t ids[] = {10, 1, 16};
-    DisplayIdList list = GenerateDisplayIdList(std::begin(ids), std::end(ids));
+    display::DisplayIdList list =
+        GenerateDisplayIdList(std::begin(ids), std::end(ids));
     EXPECT_EQ("16,1,10", DisplayIdListToString(list));
   }
 }
 
 }  // namespace