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

ash/common/test/ash_test.h

 // Copyright 2016 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_COMMON_TEST_ASH_TEST_H_
 #define ASH_COMMON_TEST_ASH_TEST_H_
 
 #include <memory>
 #include <string>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace views {
 class WidgetDelegate;
@@ skipping 117 matching lines @@
 
  private:
   std::unique_ptr<AshTestImpl> test_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTest);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_TEST_ASH_TEST_H_