Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/test/display_manager_test_api.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
-#include "ash/display/display_layout.h"
 #include "base/macros.h"
+#include "ui/display/manager/display_layout.h"
 #include "ui/display/types/display_constants.h"
 
 namespace gfx {
 class Point;
 class Size;
 }
 
 namespace ui {
 namespace test {
 class EventGenerator;
@@ skipping 66 matching lines @@
 bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution);
 
 // Swap the primary display with the secondary.
 void SwapPrimaryDisplay();
 
 // Creates the dislpay layout from position and offset for the current
 // display list. If you simply want to create a new layout that is
 // independent of current displays, use DisplayLayoutBuilder or simply
 // create a new DisplayLayout and set display id fields (primary, ids
 // in placement) manually.
-scoped_ptr<DisplayLayout> CreateDisplayLayout(
-    DisplayPlacement::Position position,
+scoped_ptr<display::DisplayLayout> CreateDisplayLayout(
+    display::DisplayPlacement::Position position,
     int offset);
 
 // Creates the DisplayIdList from ints.
-DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
-DisplayIdList CreateDisplayIdListN(size_t count, ...);
+display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
+display::DisplayIdList CreateDisplayIdListN(size_t count, ...);
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_