Move ash::DisplayInfo to ui

ash/display/unified_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/display/unified_mouse_warp_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
@@ skipping 21 matching lines @@
   }
 
  protected:
   bool FindMirrroingDisplayIdContainingNativePoint(
       const gfx::Point& point_in_native,
       int64_t* display_id,
       gfx::Point* point_in_mirroring_host,
       gfx::Point* point_in_unified_host) {
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
     for (auto display : display_manager->software_mirroring_display_list()) {
-      DisplayInfo info = display_manager->GetDisplayInfo(display.id());
+      ui::DisplayInfo info = display_manager->GetDisplayInfo(display.id());
       if (info.bounds_in_native().Contains(point_in_native)) {
         *display_id = info.id();
         *point_in_unified_host = point_in_native;
         const gfx::Point& origin = info.bounds_in_native().origin();
         // Convert to mirroring host.
         point_in_unified_host->Offset(-origin.x(), -origin.y());
         *point_in_mirroring_host = *point_in_unified_host;
         // Convert from mirroring host to unified host.
         AshWindowTreeHost* ash_host =
             Shell::GetInstance()
@@ skipping 201 matching lines @@
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(600, 10)));
   EXPECT_EQ("249,5",  // moved to 498 by 2px, divided by 2 (dsf).
             aura::Env::GetInstance()->last_mouse_location().ToString());
   {
     SCOPED_TRACE("1x2 NO WARP");
     NoWarpTestBody();
   }
 }
 
 }  // namespace aura