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

ui/display/manager/chromeos/test/test_display_layout_manager.h

 // Copyright 2015 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_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_
-#define UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
-#include "ui/display/chromeos/display_configurator.h"
-#include "ui/display/chromeos/display_layout_manager.h"
+#include "ui/display/manager/chromeos/display_configurator.h"
+#include "ui/display/manager/chromeos/display_layout_manager.h"
 
 namespace ui {
 namespace test {
 
 class TestDisplayLayoutManager : public DisplayLayoutManager {
  public:
   TestDisplayLayoutManager(ScopedVector<DisplaySnapshot> displays,
                            MultipleDisplayState display_state);
   ~TestDisplayLayoutManager() override;
 
@@ skipping 14 matching lines @@
  private:
   ScopedVector<DisplaySnapshot> displays_;
   MultipleDisplayState display_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDisplayLayoutManager);
 };
 
 }  // namespace test
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_TEST_TEST_DISPLAY_LAYOUT_MANAGER_H_