Move DisplayChangeObserver + tests from ash to ui.

ui/display/chromeos/display_change_observer_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 "ui/display/chromeos/display_change_observer.h"
+
+#include <string>
 
 #include "base/memory/ptr_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/fake_display_snapshot.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/types/display_mode.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 using ui::DisplayConfigurator;
 
-namespace ash {
+namespace display {
 
 namespace {
 
 float ComputeDeviceScaleFactor(float diagonal_inch,
                                const gfx::Rect& resolution) {
   // We assume that displays have square pixel.
   float diagonal_pixel = std::sqrt(std::pow(resolution.width(), 2) +
                                    std::pow(resolution.height(), 2));
   float dpi = diagonal_pixel / diagonal_inch;
   return DisplayChangeObserver::FindDeviceScaleFactor(dpi);
 }
 
 std::unique_ptr<ui::DisplayMode> MakeDisplayMode(int width,
                                                  int height,
                                                  bool is_interlaced,
                                                  float refresh_rate) {
   return base::MakeUnique<ui::DisplayMode>(gfx::Size(width, height),
                                            is_interlaced, refresh_rate);
 }
 
 }  // namespace
 
 TEST(DisplayChangeObserverTest, GetExternalManagedDisplayModeList) {
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(1920, 1200, false, 60))
           // All non-interlaced (as would be seen with different refresh rates).
           .AddMode(MakeDisplayMode(1920, 1080, false, 80))
           .AddMode(MakeDisplayMode(1920, 1080, false, 70))
           .AddMode(MakeDisplayMode(1920, 1080, false, 60))
           // Interlaced vs non-interlaced.
           .AddMode(MakeDisplayMode(1280, 720, true, 60))
           .AddMode(MakeDisplayMode(1280, 720, false, 60))
           // Interlaced only.
           .AddMode(MakeDisplayMode(1024, 768, true, 70))
           .AddMode(MakeDisplayMode(1024, 768, true, 60))
           // Mixed.
           .AddMode(MakeDisplayMode(1024, 600, true, 60))
           .AddMode(MakeDisplayMode(1024, 600, false, 70))
           .AddMode(MakeDisplayMode(1024, 600, false, 60))
           // Just one interlaced mode.
           .AddMode(MakeDisplayMode(640, 480, true, 60))
           .Build();
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::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);
 
   EXPECT_EQ("1024x768", display_modes[2]->size().ToString());
   EXPECT_TRUE(display_modes[2]->is_interlaced());
   EXPECT_EQ(display_modes[2]->refresh_rate(), 70);
 
   EXPECT_EQ("1280x720", display_modes[3]->size().ToString());
   EXPECT_FALSE(display_modes[3]->is_interlaced());
   EXPECT_EQ(display_modes[3]->refresh_rate(), 60);
 
   EXPECT_EQ("1920x1080", display_modes[4]->size().ToString());
   EXPECT_FALSE(display_modes[4]->is_interlaced());
   EXPECT_EQ(display_modes[4]->refresh_rate(), 80);
 
   EXPECT_EQ("1920x1200", display_modes[5]->size().ToString());
   EXPECT_FALSE(display_modes[5]->is_interlaced());
   EXPECT_EQ(display_modes[5]->refresh_rate(), 60);
 }
 
 TEST(DisplayChangeObserverTest, GetEmptyExternalManagedDisplayModeList) {
-  display::FakeDisplaySnapshot display_snapshot(
+  FakeDisplaySnapshot display_snapshot(
       123, gfx::Point(), gfx::Size(), ui::DISPLAY_CONNECTION_TYPE_UNKNOWN,
       false, false, false, std::string(), 0,
       std::vector<std::unique_ptr<const ui::DisplayMode>>(), nullptr, nullptr);
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetExternalManagedDisplayModeList(
           display_snapshot);
   EXPECT_EQ(0u, display_modes.size());
 }
 
 TEST(DisplayChangeObserverTest, GetInternalManagedDisplayModeList) {
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(1366, 768, false, 60))
           .AddMode(MakeDisplayMode(1024, 768, false, 60))
           .AddMode(MakeDisplayMode(800, 600, false, 60))
           .AddMode(MakeDisplayMode(600, 600, false, 56.2))
           .AddMode(MakeDisplayMode(640, 480, false, 59.9))
           .Build();
 
-  display::ManagedDisplayInfo info(1, "", false);
+  ManagedDisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 1366, 768));
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::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 12 matching lines @@
 
   EXPECT_EQ("1366x768", display_modes[4]->size().ToString());
   EXPECT_FALSE(display_modes[4]->native());
   EXPECT_NEAR(display_modes[4]->ui_scale(), 1.125, 0.01);
   EXPECT_EQ(display_modes[4]->refresh_rate(), 60);
 }
 
 TEST(DisplayChangeObserverTest, GetInternalHiDPIManagedDisplayModeList) {
   // Data picked from peppy.
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(2560, 1700, false, 60))
           .AddMode(MakeDisplayMode(2048, 1536, false, 60))
           .AddMode(MakeDisplayMode(1920, 1440, false, 60))
           .Build();
 
-  display::ManagedDisplayInfo info(1, "", false);
+  ManagedDisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 2560, 1700));
   info.set_device_scale_factor(2.0f);
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::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 27 matching lines @@
 
   EXPECT_EQ("2560x1700", display_modes[7]->size().ToString());
   EXPECT_TRUE(display_modes[7]->native());
   EXPECT_NEAR(display_modes[7]->ui_scale(), 2.0, 0.01);
   EXPECT_EQ(display_modes[7]->refresh_rate(), 60);
 }
 
 TEST(DisplayChangeObserverTest, GetInternalManagedDisplayModeList1_25) {
   // Data picked from peppy.
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(1920, 1080, false, 60))
           .Build();
 
-  display::ManagedDisplayInfo info(1, "", false);
+  ManagedDisplayInfo info(1, "", false);
   info.SetBounds(gfx::Rect(0, 0, 1920, 1080));
   info.set_device_scale_factor(1.25);
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::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 11 matching lines @@
   EXPECT_EQ(display_modes[3]->refresh_rate(), 60);
 
   EXPECT_EQ("1920x1080", display_modes[4]->size().ToString());
   EXPECT_FALSE(display_modes[4]->native());
   EXPECT_NEAR(display_modes[4]->ui_scale(), 1.25, 0.01);
   EXPECT_EQ(display_modes[4]->refresh_rate(), 60);
 }
 
 TEST(DisplayChangeObserverTest, GetExternalManagedDisplayModeList4K) {
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(3840, 2160, false, 30))
           .AddMode(MakeDisplayMode(1920, 1200, false, 60))
           // All non-interlaced (as would be seen with different refresh rates).
           .AddMode(MakeDisplayMode(1920, 1080, false, 80))
           .AddMode(MakeDisplayMode(1920, 1080, false, 70))
           .AddMode(MakeDisplayMode(1920, 1080, false, 60))
           // Interlaced vs non-interlaced.
           .AddMode(MakeDisplayMode(1280, 720, true, 60))
           .AddMode(MakeDisplayMode(1280, 720, false, 60))
           // Interlaced only.
           .AddMode(MakeDisplayMode(1024, 768, true, 70))
           .AddMode(MakeDisplayMode(1024, 768, true, 60))
           // Mixed.
           .AddMode(MakeDisplayMode(1024, 600, true, 60))
           .AddMode(MakeDisplayMode(1024, 600, false, 70))
           .AddMode(MakeDisplayMode(1024, 600, false, 60))
           // Just one interlaced mode.
           .AddMode(MakeDisplayMode(640, 480, true, 60))
           .Build();
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::ManagedDisplayModeList display_modes =
       DisplayChangeObserver::GetExternalManagedDisplayModeList(
           *display_snapshot);
-  display::ManagedDisplayInfo info(1, "", false);
+  ManagedDisplayInfo 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 55 matching lines @@
   EXPECT_EQ(2.0f, ComputeDeviceScaleFactor(12.85f, gfx::Rect(2560, 1700)));
 
   // Erroneous values should still work.
   EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(-100.0f));
   EXPECT_EQ(1.0f, DisplayChangeObserver::FindDeviceScaleFactor(0.0f));
   EXPECT_EQ(2.0f, DisplayChangeObserver::FindDeviceScaleFactor(10000.0f));
 }
 
 TEST(DisplayChangeObserverTest, FindExternalDisplayNativeModeWhenOverwritten) {
   std::unique_ptr<ui::DisplaySnapshot> display_snapshot =
-      display::FakeDisplaySnapshot::Builder()
+      FakeDisplaySnapshot::Builder()
           .SetId(123)
           .SetNativeMode(MakeDisplayMode(1920, 1080, true, 60))
           .AddMode(MakeDisplayMode(1920, 1080, false, 60))
           .Build();
 
-  display::ManagedDisplayInfo::ManagedDisplayModeList display_modes =
+  ManagedDisplayInfo::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
+}  // namespace display