Refactoring display configuration state to allow generic state objects

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
index d99b15430f4c51bbcbe73cfae256cdcb40b12c87..096e24f5fdaee73a0af3c43f999109e4a90dad74 100644
--- a/ash/display/display_change_observer_chromeos_unittest.cc
+++ b/ash/display/display_change_observer_chromeos_unittest.cc
@@ -5,8 +5,11 @@
 #include "ash/display/display_change_observer_chromeos.h"
 
 #include "ash/display/display_info.h"
+#include "base/memory/scoped_vector.h"
 #include "chromeos/display/output_configurator.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/chromeos/display_mode.h"
+#include "ui/display/chromeos/test/test_display_snapshot.h"
 
 using chromeos::OutputConfigurator;
 
@@ -16,29 +19,34 @@ namespace ash {
 namespace internal {
 
 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
-  OutputConfigurator::OutputSnapshot output;
-  output.mode_infos[11] = OutputConfigurator::ModeInfo(1920, 1200, false, 60);
+  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));
+
+  ui::TestDisplaySnapshot display_snapshot;
+  display_snapshot.set_modes(modes.get());
+  OutputConfigurator::InternalDisplayState output;
+  output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =
       DisplayChangeObserver::GetDisplayModeList(output);
@@ -68,7 +76,9 @@ TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
   EXPECT_EQ(display_modes[5].refresh_rate, 60);
 
   // Outputs without any modes shouldn't cause a crash.
-  output.mode_infos.clear();
+  modes.clear();
+  display_snapshot.set_modes(modes.get());
+
   display_modes = DisplayChangeObserver::GetDisplayModeList(output);
   EXPECT_EQ(0u, display_modes.size());
 }