Move ash::DisplayInfo to ui

ash/display/resolution_notification_controller_unittest.cc

Index: ash/display/resolution_notification_controller_unittest.cc
diff --git a/ash/display/resolution_notification_controller_unittest.cc b/ash/display/resolution_notification_controller_unittest.cc
index bdac219ed15cc76a0a03c8b3d0d6b2c86a160fe5..43c755ac66f198c406adf040eb7f58bbd23000b8 100644
--- a/ash/display/resolution_notification_controller_unittest.cc
+++ b/ash/display/resolution_notification_controller_unittest.cc
@@ -63,11 +63,12 @@ class ResolutionNotificationControllerTest : public ash::test::AshTestBase {
       const gfx::Size& actual_new_resolution) {
     DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-    const DisplayInfo& info = display_manager->GetDisplayInfo(display.id());
-    scoped_refptr<ManagedDisplayMode> old_mode(
-        new ManagedDisplayMode(info.size_in_pixel(), 60 /* refresh_rate */,
-                               false /* interlaced */, false /* native */));
-    scoped_refptr<ManagedDisplayMode> new_mode(new ManagedDisplayMode(
+    const ui::ManagedDisplayInfo& info =
+        display_manager->GetDisplayInfo(display.id());
+    scoped_refptr<ui::ManagedDisplayMode> old_mode(
+        new ui::ManagedDisplayMode(info.size_in_pixel(), 60 /* refresh_rate */,
+                                   false /* interlaced */, false /* native */));
+    scoped_refptr<ui::ManagedDisplayMode> new_mode(new ui::ManagedDisplayMode(
         new_resolution, old_mode->refresh_rate(), old_mode->is_interlaced(),
         old_mode->native(), old_mode->ui_scale(),
         old_mode->device_scale_factor()));
@@ -81,10 +82,10 @@ class ResolutionNotificationControllerTest : public ash::test::AshTestBase {
 
     // OnConfigurationChanged event won't be emitted in the test environment,
     // so invoke UpdateDisplay() to emit that event explicitly.
-    std::vector<DisplayInfo> info_list;
+    std::vector<ui::ManagedDisplayInfo> info_list;
     for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
       int64_t id = display_manager->GetDisplayAt(i).id();
-      DisplayInfo info = display_manager->GetDisplayInfo(id);
+      ui::ManagedDisplayInfo info = display_manager->GetDisplayInfo(id);
       if (display.id() == id) {
         gfx::Rect bounds = info.bounds_in_native();
         bounds.set_size(actual_new_resolution);
@@ -173,7 +174,7 @@ TEST_F(ResolutionNotificationControllerTest, Basic) {
   EXPECT_FALSE(controller()->DoesNotificationTimeout());
   EXPECT_EQ(ExpectedNotificationMessage(id2, gfx::Size(200, 200)),
             GetNotificationMessage());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("200x200", mode->size().ToString());
@@ -206,7 +207,7 @@ TEST_F(ResolutionNotificationControllerTest, ClickMeansAccept) {
                                 gfx::Size(200, 200));
   EXPECT_TRUE(IsNotificationVisible());
   EXPECT_FALSE(controller()->DoesNotificationTimeout());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("200x200", mode->size().ToString());
@@ -243,7 +244,7 @@ TEST_F(ResolutionNotificationControllerTest, AcceptButton) {
   EXPECT_FALSE(IsNotificationVisible());
   EXPECT_EQ(1, accept_count());
 
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(display.id());
   EXPECT_TRUE(!!mode);
 
@@ -282,7 +283,7 @@ TEST_F(ResolutionNotificationControllerTest, Close) {
                                 gfx::Size(200, 200));
   EXPECT_TRUE(IsNotificationVisible());
   EXPECT_FALSE(controller()->DoesNotificationTimeout());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("200x200", mode->size().ToString());
@@ -315,7 +316,7 @@ TEST_F(ResolutionNotificationControllerTest, Timeout) {
   EXPECT_EQ(0, accept_count());
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(display.id());
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("300x300", mode->size().ToString());
@@ -341,7 +342,7 @@ TEST_F(ResolutionNotificationControllerTest, DisplayDisconnected) {
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(IsNotificationVisible());
   EXPECT_EQ(0, accept_count());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   gfx::Size resolution;
@@ -364,7 +365,7 @@ TEST_F(ResolutionNotificationControllerTest, MultipleResolutionChange) {
                                 gfx::Size(200, 200));
   EXPECT_TRUE(IsNotificationVisible());
   EXPECT_FALSE(controller()->DoesNotificationTimeout());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("200x200", mode->size().ToString());
@@ -414,7 +415,7 @@ TEST_F(ResolutionNotificationControllerTest, Fallback) {
   EXPECT_EQ(ExpectedFallbackNotificationMessage(id2, gfx::Size(220, 220),
                                                 gfx::Size(200, 200)),
             GetNotificationMessage());
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       display_manager->GetSelectedModeForDisplayId(id2);
   EXPECT_TRUE(!!mode);
   EXPECT_EQ("200x200", mode->size().ToString());