Split //ui/display and create //ui/display/manager.

ui/display/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 UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_
 #define UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "ui/display/display.h"
 #include "ui/display/display_export.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/types/display_constants.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace display {
 class DisplayManager;
 class ManagedDisplayInfo;
 
@@ skipping 78 matching lines @@
     int offset);
 
 // Creates the DisplayIdList from ints.
 DISPLAY_EXPORT DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
 DISPLAY_EXPORT DisplayIdList CreateDisplayIdListN(size_t count, ...);
 
 }  // namespace test
 }  // namespace display
 
 #endif  // UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_