Move ash::DisplayInfo to ui

ash/display/display_change_observer_chromeos_unittest.cc

 // Copyright 2013 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/display_change_observer_chromeos.h"
 
-#include "ash/common/display/display_info.h"
 #include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
+#include "ui/display/manager/display_info.h"
 #include "ui/display/types/display_mode.h"
 
 using ui::DisplayConfigurator;
 
 typedef testing::Test DisplayChangeObserverTest;
 
 namespace ash {
 
 TEST_F(DisplayChangeObserverTest, GetExternalManagedDisplayModeList) {
   std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
@@ skipping 28 matching lines @@
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), true, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetExternalManagedDisplayModeList(
           display_snapshot);
   ASSERT_EQ(6u, display_modes.size());
   EXPECT_EQ("640x480", display_modes[0]->size().ToString());
   EXPECT_TRUE(display_modes[0]->is_interlaced());
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1024x600", display_modes[1]->size().ToString());
   EXPECT_FALSE(display_modes[1]->is_interlaced());
   EXPECT_EQ(display_modes[1]->refresh_rate(), 70);
@@ skipping 34 matching lines @@
       base::MakeUnique<ui::DisplayMode>(gfx::Size(800, 600), false, 60));
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(600, 600), false, 56.2));
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), false, 59.9));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_native_mode(modes[0].get());
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo info(1, "", false);
+  ui::DisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 1366, 768));
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetInternalManagedDisplayModeList(
           info, display_snapshot);
   ASSERT_EQ(5u, display_modes.size());
   EXPECT_EQ("1366x768", display_modes[0]->size().ToString());
   EXPECT_FALSE(display_modes[0]->native());
   EXPECT_NEAR(display_modes[0]->ui_scale(), 0.5, 0.01);
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1366x768", display_modes[1]->size().ToString());
   EXPECT_FALSE(display_modes[1]->native());
@@ skipping 23 matching lines @@
       base::MakeUnique<ui::DisplayMode>(gfx::Size(2560, 1700), false, 60));
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(2048, 1536), false, 60));
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1440), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_native_mode(modes[0].get());
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo info(1, "", false);
+  ui::DisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 2560, 1700));
   info.set_device_scale_factor(2.0f);
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetInternalManagedDisplayModeList(
           info, display_snapshot);
   ASSERT_EQ(8u, display_modes.size());
   EXPECT_EQ("2560x1700", display_modes[0]->size().ToString());
   EXPECT_FALSE(display_modes[0]->native());
   EXPECT_NEAR(display_modes[0]->ui_scale(), 0.5, 0.01);
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("2560x1700", display_modes[1]->size().ToString());
   EXPECT_FALSE(display_modes[1]->native());
@@ skipping 34 matching lines @@
 TEST_F(DisplayChangeObserverTest, GetInternalManagedDisplayModeList1_25) {
   std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
   // Data picked from peppy.
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_native_mode(modes[0].get());
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo info(1, "", false);
+  ui::DisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 1920, 1080));
   info.set_device_scale_factor(1.25);
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetInternalManagedDisplayModeList(
           info, display_snapshot);
   ASSERT_EQ(5u, display_modes.size());
   EXPECT_EQ("1920x1080", display_modes[0]->size().ToString());
   EXPECT_FALSE(display_modes[0]->native());
   EXPECT_NEAR(display_modes[0]->ui_scale(), 0.5, 0.01);
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1920x1080", display_modes[1]->size().ToString());
   EXPECT_FALSE(display_modes[1]->native());
@@ skipping 52 matching lines @@
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(640, 480), true, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_native_mode(modes[0].get());
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetExternalManagedDisplayModeList(
           display_snapshot);
-  DisplayInfo info(1, "", false);
+  ui::DisplayInfo info(1, "", false);
   info.SetManagedDisplayModes(display_modes);  // Sort as external display.
   display_modes = info.display_modes();
 
   ASSERT_EQ(9u, display_modes.size());
   EXPECT_EQ("640x480", display_modes[0]->size().ToString());
   EXPECT_TRUE(display_modes[0]->is_interlaced());
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1024x600", display_modes[1]->size().ToString());
   EXPECT_FALSE(display_modes[1]->is_interlaced());
@@ skipping 87 matching lines @@
   std::vector<std::unique_ptr<const ui::DisplayMode>> modes;
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), true, 60));
   modes.push_back(
       base::MakeUnique<ui::DisplayMode>(gfx::Size(1920, 1080), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_native_mode(modes[0].get());
   display_snapshot.set_modes(std::move(modes));
 
-  DisplayInfo::ManagedDisplayModeList display_modes =
+  ui::DisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetExternalManagedDisplayModeList(
           display_snapshot);
   ASSERT_EQ(2u, display_modes.size());
   EXPECT_EQ("1920x1080", display_modes[0]->size().ToString());
   EXPECT_FALSE(display_modes[0]->is_interlaced());
   EXPECT_FALSE(display_modes[0]->native());
   EXPECT_EQ(display_modes[0]->refresh_rate(), 60);
 
   EXPECT_EQ("1920x1080", display_modes[1]->size().ToString());
   EXPECT_TRUE(display_modes[1]->is_interlaced());
   EXPECT_TRUE(display_modes[1]->native());
   EXPECT_EQ(display_modes[1]->refresh_rate(), 60);
 }
 
 }  // namespace ash