Move ash::DisplayInfo to ui

ash/wm/ash_native_cursor_manager_interactive_uitest.cc

Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index 4a3afab1a7f137e1edf75031d89acfc5a9589e9c..8bac7924c7c8630ab8d57bb7eb5b4d4987b640a4 100644
--- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 #include "ash/wm/ash_native_cursor_manager.h"
 
-#include "ash/common/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_interactive_ui_test_base.h"
@@ -12,6 +11,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls.h"
+#include "ui/display/manager/managed_display_info.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ -25,10 +25,10 @@ using AshNativeCursorManagerTest = test::AshInteractiveUITestBase;
 
 namespace {
 
-DisplayInfo CreateDisplayInfo(int64_t id,
-                              const gfx::Rect& bounds,
-                              float device_scale_factor) {
-  DisplayInfo info(id, "", false);
+ui::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
+                                         const gfx::Rect& bounds,
+                                         float device_scale_factor) {
+  ui::ManagedDisplayInfo info(id, "", false);
   info.SetBounds(bounds);
   info.set_device_scale_factor(device_scale_factor);
   return info;
@@ -60,11 +60,11 @@ TEST_F(AshNativeCursorManagerTest, MAYBE_CursorChangeOnEnterNotify) {
   test::CursorManagerTestApi test_api(cursor_manager);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  DisplayInfo display_info1 =
+  ui::ManagedDisplayInfo display_info1 =
       CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300), 1.0f);
-  DisplayInfo display_info2 =
+  ui::ManagedDisplayInfo display_info2 =
       CreateDisplayInfo(20, gfx::Rect(500, 0, 500, 300), 2.0f);
-  std::vector<DisplayInfo> display_info_list;
+  std::vector<ui::ManagedDisplayInfo> display_info_list;
   display_info_list.push_back(display_info1);
   display_info_list.push_back(display_info2);
   display_manager->OnNativeDisplaysChanged(display_info_list);