Relocate display_manager from ash to ui

ash/test/ash_test_base.cc

 // 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.
 
 #include "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/extended_mouse_warp_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/unified_mouse_warp_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/shell.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/test/ash_test_environment.h"
 #include "ash/test/ash_test_helper.h"
-#include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/display/display.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/screen.h"
+#include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/platform_window/win/win_window.h"
 #endif
 
 #if defined(USE_X11)
@@ skipping 155 matching lines @@
   return GetActiveDisplayRotation(display::Display::InternalDisplayId());
 }
 
 // static
 bool AshTestBase::SupportsMultipleDisplays() {
   return AshTestHelper::SupportsMultipleDisplays();
 }
 
 // static
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
-  DisplayManagerTestApi(Shell::GetInstance()->display_manager())
+  display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
       .UpdateDisplay(display_specs);
 }
 
 aura::Window* AshTestBase::CurrentContext() {
   return ash_test_helper_->CurrentContext();
 }
 
 // static
 std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget(
     views::WidgetDelegate* delegate,
@@ skipping 138 matching lines @@
   SetUserAddingScreenRunning(false);
 }
 
 void AshTestBase::DisableIME() {
   Shell::GetInstance()->RemovePreTargetHandler(
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->input_method_event_handler());
 }
 
-DisplayManager* AshTestBase::display_manager() {
+display::DisplayManager* AshTestBase::display_manager() {
   return Shell::GetInstance()->display_manager();
 }
 
 bool AshTestBase::TestIfMouseWarpsAt(ui::test::EventGenerator& event_generator,
                                      const gfx::Point& point_in_screen) {
   DCHECK(!Shell::GetInstance()->display_manager()->IsInUnifiedMode());
   static_cast<ExtendedMouseWarpController*>(
       Shell::GetInstance()
           ->mouse_cursor_filter()
           ->mouse_warp_controller_for_test())
@@ skipping 11 matching lines @@
 
 void AshTestBase::SwapPrimaryDisplay() {
   if (display::Screen::GetScreen()->GetNumDisplays() <= 1)
     return;
   Shell::GetInstance()->window_tree_host_manager()->SetPrimaryDisplayId(
       display_manager()->GetSecondaryDisplay().id());
 }
 
 }  // namespace test
 }  // namespace ash