Relocate display_manager from ash to ui

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 namespace aura {
 class RootWindow;
 class Window;
 class WindowDelegate;
 }  // namespace aura
 
+namespace display {
+class DisplayManager;
+
+namespace test {
+class DisplayManagerTestApi;
+}  // namespace test
+}  // namespace display
+
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 namespace test {
 class EventGenerator;
 }
 }
 
 namespace views {
 class Widget;
 class WidgetDelegate;
 }
 
 namespace ash {
 class AshTestImplAura;
-class DisplayManager;
 class SystemTray;
 class WmShelf;
 
 namespace test {
 
 class AshTestEnvironment;
 class AshTestHelper;
 class TestScreenshotDelegate;
 class TestSystemTrayDelegate;
 
@@ skipping 47 matching lines @@
 
   // Attach |window| to the current shell's root window.
   void ParentWindowInPrimaryRootWindow(aura::Window* window);
 
   // Returns the EventGenerator that uses screen coordinates and works
   // across multiple displays. It createse a new generator if it
   // hasn't been created yet.
   ui::test::EventGenerator& GetEventGenerator();
 
   // Convenience method to return the DisplayManager.
-  DisplayManager* display_manager();
+  display::DisplayManager* display_manager();
 
   // Test if moving a mouse to |point_in_screen| warps it to another
   // display.
   bool TestIfMouseWarpsAt(ui::test::EventGenerator& event_generator,
                           const gfx::Point& point_in_screen);
 
  protected:
   enum UserSessionBlockReason {
     FIRST_BLOCK_REASON,
     BLOCKED_BY_LOCK_SCREEN = FIRST_BLOCK_REASON,
@@ skipping 73 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_