Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/extended_desktop_unittest.cc

Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 035e925d78ab9f1185de281b8e6db41d43f47d05..b42f2d44b88c4ed3f749ad93bf5f95fafdbd9ff3 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -21,6 +21,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
+#include "ui/display/manager/display_layout.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
@@ -33,8 +34,8 @@
 namespace ash {
 namespace {
 
-void SetSecondaryDisplayLayout(DisplayPlacement::Position position) {
-  scoped_ptr<DisplayLayout> layout =
+void SetSecondaryDisplayLayout(display::DisplayPlacement::Position position) {
+  scoped_ptr<display::DisplayLayout> layout =
       Shell::GetInstance()->display_manager()->GetCurrentDisplayLayout().Copy();
   layout->placement_list[0].position = position;
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
@@ -310,7 +311,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowAt) {
     return;
 
   UpdateDisplay("700x500,500x500");
-  SetSecondaryDisplayLayout(DisplayPlacement::LEFT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   EXPECT_EQ(root_windows[1], wm::GetRootWindowAt(gfx::Point(-400, 100)));
@@ -331,7 +332,7 @@ TEST_F(ExtendedDesktopTest, GetRootWindowMatching) {
     return;
 
   UpdateDisplay("700x500,500x500");
-  SetSecondaryDisplayLayout(DisplayPlacement::LEFT);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::LEFT);
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
@@ -732,7 +733,7 @@ TEST_F(ExtendedDesktopTest, ConvertPoint) {
   EXPECT_EQ("-1010,-10", p.ToString());
 
   // Move the 2nd display to the bottom and test again.
-  SetSecondaryDisplayLayout(DisplayPlacement::BOTTOM);
+  SetSecondaryDisplayLayout(display::DisplayPlacement::BOTTOM);
 
   display_2 = screen->GetDisplayNearestWindow(root_windows[1]);
   EXPECT_EQ("0,600", display_2.bounds().origin().ToString());