Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / display_change_observer_chromeos_unittest.cc

diff --git a/src/ash/display/display_change_observer_chromeos_unittest.cc b/src/ash/display/display_change_observer_chromeos_unittest.cc
index 1f64be7..aa668e9 100644 (file)
--- a/src/ash/display/display_change_observer_chromeos_unittest.cc
+++ b/src/ash/display/display_change_observer_chromeos_unittest.cc
@@ -5,67 +5,81 @@
 #include "ash/display/display_change_observer_chromeos.h"
 
 #include "ash/display/display_info.h"
-#include "chromeos/display/output_configurator.h"
+#include "base/memory/scoped_vector.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/types/chromeos/display_mode.h"
 
-using chromeos::OutputConfigurator;
+using ui::DisplayConfigurator;
 
 typedef testing::Test DisplayChangeObserverTest;
 
 namespace ash {
-namespace internal {
 
-TEST_F(DisplayChangeObserverTest, GetResolutionList) {
-  OutputConfigurator::OutputSnapshot output;
-  output.mode_infos[11] = OutputConfigurator::ModeInfo(1920, 1200, false, 60);
+TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
+  ScopedVector<const ui::DisplayMode> modes;
+  modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60));
 
   // All non-interlaced (as would be seen with different refresh rates).
-  output.mode_infos[12] = OutputConfigurator::ModeInfo(1920, 1080, false, 80);
-  output.mode_infos[13] = OutputConfigurator::ModeInfo(1920, 1080, false, 70);
-  output.mode_infos[14] = OutputConfigurator::ModeInfo(1920, 1080, false, 60);
+  modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 80));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 70));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60));
 
   // Interlaced vs non-interlaced.
-  output.mode_infos[15] = OutputConfigurator::ModeInfo(1280, 720, true, 60);
-  output.mode_infos[16] = OutputConfigurator::ModeInfo(1280, 720, false, 60);
+  modes.push_back(new ui::DisplayMode(gfx::Size(1280, 720), true, 60));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1280, 720), false, 60));
 
   // Interlaced only.
-  output.mode_infos[17] = OutputConfigurator::ModeInfo(1024, 768, true, 70);
-  output.mode_infos[18] = OutputConfigurator::ModeInfo(1024, 768, true, 60);
+  modes.push_back(new ui::DisplayMode(gfx::Size(1024, 768), true, 70));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1024, 768), true, 60));
 
   // Mixed.
-  output.mode_infos[19] = OutputConfigurator::ModeInfo(1024, 600, true, 60);
-  output.mode_infos[20] = OutputConfigurator::ModeInfo(1024, 600, false, 70);
-  output.mode_infos[21] = OutputConfigurator::ModeInfo(1024, 600, false, 60);
+  modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), true, 60));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 70));
+  modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
-  output.mode_infos[22] = OutputConfigurator::ModeInfo(640, 480, true, 60);
+  modes.push_back(new ui::DisplayMode(gfx::Size(640, 480), true, 60));
 
-  std::vector<Resolution> resolutions =
-      DisplayChangeObserver::GetResolutionList(output);
-  ASSERT_EQ(6u, resolutions.size());
-  EXPECT_EQ("1920x1200", resolutions[0].size.ToString());
-  EXPECT_FALSE(resolutions[0].interlaced);
+  ui::TestDisplaySnapshot display_snapshot;
+  display_snapshot.set_modes(modes.get());
+  DisplayConfigurator::DisplayState output;
+  output.display = &display_snapshot;
 
-  EXPECT_EQ("1920x1080", resolutions[1].size.ToString());
-  EXPECT_FALSE(resolutions[1].interlaced);
+  std::vector<DisplayMode> display_modes =
+      DisplayChangeObserver::GetDisplayModeList(output);
+  ASSERT_EQ(6u, display_modes.size());
+  EXPECT_EQ("1920x1200", display_modes[0].size.ToString());
+  EXPECT_FALSE(display_modes[0].interlaced);
+  EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
-  EXPECT_EQ("1280x720", resolutions[2].size.ToString());
-  EXPECT_FALSE(resolutions[2].interlaced);
+  EXPECT_EQ("1920x1080", display_modes[1].size.ToString());
+  EXPECT_FALSE(display_modes[1].interlaced);
+  EXPECT_EQ(display_modes[1].refresh_rate, 80);
 
-  EXPECT_EQ("1024x768", resolutions[3].size.ToString());
-  EXPECT_TRUE(resolutions[3].interlaced);
+  EXPECT_EQ("1280x720", display_modes[2].size.ToString());
+  EXPECT_FALSE(display_modes[2].interlaced);
+  EXPECT_EQ(display_modes[2].refresh_rate, 60);
 
-  EXPECT_EQ("1024x600", resolutions[4].size.ToString());
-  EXPECT_FALSE(resolutions[4].interlaced);
+  EXPECT_EQ("1024x768", display_modes[3].size.ToString());
+  EXPECT_TRUE(display_modes[3].interlaced);
+  EXPECT_EQ(display_modes[3].refresh_rate, 70);
 
-  EXPECT_EQ("640x480", resolutions[5].size.ToString());
-  EXPECT_TRUE(resolutions[5].interlaced);
+  EXPECT_EQ("1024x600", display_modes[4].size.ToString());
+  EXPECT_FALSE(display_modes[4].interlaced);
+  EXPECT_EQ(display_modes[4].refresh_rate, 70);
+
+  EXPECT_EQ("640x480", display_modes[5].size.ToString());
+  EXPECT_TRUE(display_modes[5].interlaced);
+  EXPECT_EQ(display_modes[5].refresh_rate, 60);
 
   // Outputs without any modes shouldn't cause a crash.
-  output.mode_infos.clear();
-  resolutions = DisplayChangeObserver::GetResolutionList(output);
-  EXPECT_EQ(0u, resolutions.size());
+  modes.clear();
+  display_snapshot.set_modes(modes.get());
+
+  display_modes = DisplayChangeObserver::GetDisplayModeList(output);
+  EXPECT_EQ(0u, display_modes.size());
 }
 
-}  // namespace internal
 }  // namespace ash