Move ash::DisplayInfo to ui

ash/dip_unittest.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 <algorithm>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf.h"
@@ skipping 42 matching lines @@
   gfx::Rect work_area = display.work_area();
   EXPECT_EQ(gfx::Rect(0, 0, 1000, 853 + height_offset).ToString(),
             work_area.ToString());
   EXPECT_EQ(gfx::Insets(0, 0, 47 - height_offset, 0).ToString(),
             display.bounds().InsetsFrom(work_area).ToString());
 
   UpdateDisplay("2000x1800*2.0f");
   display::Screen* screen = display::Screen::GetScreen();
 
   const display::Display display_2x = screen->GetDisplayNearestWindow(root);
-  const DisplayInfo display_info_2x =
+  const display::ManagedDisplayInfo display_info_2x =
       Shell::GetInstance()->display_manager()->GetDisplayInfo(display_2x.id());
 
   // The |bounds_in_pixel()| should report bounds in pixel coordinate.
   EXPECT_EQ("1,1 2000x1800", display_info_2x.bounds_in_native().ToString());
 
   // Aura and views coordinates are in DIP, so they their bounds do not change.
   EXPECT_EQ("0,0 1000x900", display_2x.bounds().ToString());
   work_area = display_2x.work_area();
   EXPECT_EQ(gfx::Rect(0, 0, 1000, 853 + height_offset).ToString(),
             work_area.ToString());
   EXPECT_EQ(gfx::Insets(0, 0, 47 - height_offset, 0).ToString(),
             display_2x.bounds().InsetsFrom(work_area).ToString());
 
   // Sanity check if the workarea's inset hight is same as
   // the shelf's height.
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   EXPECT_EQ(display_2x.bounds().InsetsFrom(work_area).height(),
             shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash