ash: Get output info from chromeos instead of XRandR.

ash/display/display_change_observer_chromeos_unittest.cc

Index: ash/display/display_change_observer_chromeos_unittest.cc
diff --git a/ash/display/display_change_observer_chromeos_unittest.cc b/ash/display/display_change_observer_chromeos_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dc8d492742d9884045f150649168fdcaa359603d
--- /dev/null
+++ b/ash/display/display_change_observer_chromeos_unittest.cc
@@ -0,0 +1,84 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.

[oshima, 2013/08/19 20:00:24]

same here.

+// 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/display/display_info.h"
+#include "chromeos/display/output_configurator.h"
+#include "chromeos/display/output_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using chromeos::OutputConfigurator;
+
+typedef testing::Test DisplayChangeObserverTest;
+
+namespace ash {
+namespace internal {
+
+TEST_F(DisplayChangeObserverTest, TestBlackListedDisplay) {
+  EXPECT_TRUE(DisplayChangeObserver::ShouldIgnoreSize(10, 10));
+  EXPECT_TRUE(DisplayChangeObserver::ShouldIgnoreSize(40, 30));
+  EXPECT_TRUE(DisplayChangeObserver::ShouldIgnoreSize(50, 40));
+  EXPECT_TRUE(DisplayChangeObserver::ShouldIgnoreSize(160, 90));
+  EXPECT_TRUE(DisplayChangeObserver::ShouldIgnoreSize(160, 100));
+
+  EXPECT_FALSE(DisplayChangeObserver::ShouldIgnoreSize(50, 60));
+  EXPECT_FALSE(DisplayChangeObserver::ShouldIgnoreSize(100, 70));
+  EXPECT_FALSE(DisplayChangeObserver::ShouldIgnoreSize(272, 181));
+}
+
+TEST_F(DisplayChangeObserverTest, GetResolutionList) {
+  OutputConfigurator::OutputSnapshot output;
+  output.mode_infos[11] = OutputConfigurator::ModeInfo(1920, 1200, false);
+
+  // All non-interlaced (as would be seen with different refresh rates).
+  output.mode_infos[12] = OutputConfigurator::ModeInfo(1920, 1080, false);
+  output.mode_infos[13] = OutputConfigurator::ModeInfo(1920, 1080, false);
+  output.mode_infos[14] = OutputConfigurator::ModeInfo(1920, 1080, false);
+
+  // Interlaced vs non-interlaced.
+  output.mode_infos[15] = OutputConfigurator::ModeInfo(1280, 720, true);
+  output.mode_infos[16] = OutputConfigurator::ModeInfo(1280, 720, false);
+
+  // Interlaced only.
+  output.mode_infos[17] = OutputConfigurator::ModeInfo(1024, 768, true);
+  output.mode_infos[18] = OutputConfigurator::ModeInfo(1024, 768, true);
+
+  // Mixed.
+  output.mode_infos[19] = OutputConfigurator::ModeInfo(1024, 600, true);
+  output.mode_infos[20] = OutputConfigurator::ModeInfo(1024, 600, false);
+  output.mode_infos[21] = OutputConfigurator::ModeInfo(1024, 600, false);
+
+  // Just one interlaced mode.
+  output.mode_infos[22] = OutputConfigurator::ModeInfo(640, 480, true);
+
+  std::vector<Resolution> resolutions =
+      DisplayChangeObserver::GetResolutionList(output);
+  ASSERT_EQ(6u, resolutions.size());
+  EXPECT_EQ("1920x1200", resolutions[0].size.ToString());
+  EXPECT_FALSE(resolutions[0].interlaced);
+
+  EXPECT_EQ("1920x1080", resolutions[1].size.ToString());
+  EXPECT_FALSE(resolutions[1].interlaced);
+
+  EXPECT_EQ("1280x720", resolutions[2].size.ToString());
+  EXPECT_FALSE(resolutions[2].interlaced);
+
+  EXPECT_EQ("1024x768", resolutions[3].size.ToString());
+  EXPECT_TRUE(resolutions[3].interlaced);
+
+  EXPECT_EQ("1024x600", resolutions[4].size.ToString());
+  EXPECT_FALSE(resolutions[4].interlaced);
+
+  EXPECT_EQ("640x480", resolutions[5].size.ToString());
+  EXPECT_TRUE(resolutions[5].interlaced);
+
+  // Outputs without any modes shouldn't cause a crash.
+  output.mode_infos.clear();
+  resolutions = DisplayChangeObserver::GetResolutionList(output);
+  EXPECT_EQ(0u, resolutions.size());
+}
+
+}  // namespace internal
+}  // namespace ash