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

ash/test/ash_test_impl_aura.cc

 // 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.
 
 #include "ash/test/ash_test_impl_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/test/test_window_delegate.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace {
 
 // AshTestBase is abstract as TestBody() is pure virtual (the various TEST
 // macros have the implementation). In order to create AshTestBase we have to
@@ skipping 77 matching lines @@
   ::wm::AddTransientChild(WmWindowAura::GetAuraWindow(parent),
                           WmWindowAura::GetAuraWindow(window));
 }
 
 // static
 std::unique_ptr<AshTestImpl> AshTestImpl::Create() {
   return base::MakeUnique<AshTestImplAura>();
 }
 
 }  // namespace ash