Relocate display_manager from ash to ui

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/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/display_manager_test_api.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/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
 // subclass with an empty implementation of TestBody(). That's ok as the class
 // isn't used as a normal test here.
 class AshTestBaseImpl : public test::AshTestBase {
@@ skipping 52 matching lines @@
 }
 
 display::Display AshTestImplAura::GetSecondaryDisplay() {
   return Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
 }
 
 bool AshTestImplAura::SetSecondaryDisplayPlacement(
     display::DisplayPlacement::Position position,
     int offset) {
   Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
-      test::CreateDisplayLayout(Shell::GetInstance()->display_manager(),
-                                position, 0));
+      display::test::CreateDisplayLayout(
+          Shell::GetInstance()->display_manager(), position, 0));
   return true;
 }
 
 void AshTestImplAura::ConfigureWidgetInitParamsForDisplay(
     WmWindow* window,
     views::Widget::InitParams* init_params) {
   init_params->context = WmWindowAura::GetAuraWindow(window);
 }
 
 void AshTestImplAura::AddTransientChild(WmWindow* parent, WmWindow* window) {
   ::wm::AddTransientChild(WmWindowAura::GetAuraWindow(parent),
                           WmWindowAura::GetAuraWindow(window));
 }
 
 // static
 std::unique_ptr<AshTestImpl> AshTestImpl::Create() {
   return base::MakeUnique<AshTestImplAura>();
 }
 
 }  // namespace ash