Refactoring display configuration state to allow generic state objects

ash/display/projecting_observer_chromeos_unittest.cc

Index: ash/display/projecting_observer_chromeos_unittest.cc
diff --git a/ash/display/projecting_observer_chromeos_unittest.cc b/ash/display/projecting_observer_chromeos_unittest.cc
index facc68f6cfc9a6ccef1a47d3a3fa29d4d5cf3818..16d969446caccdcf038e7a2c7c2e224c205a046d 100644
--- a/ash/display/projecting_observer_chromeos_unittest.cc
+++ b/ash/display/projecting_observer_chromeos_unittest.cc
@@ -4,9 +4,11 @@
 
 #include "ash/display/projecting_observer_chromeos.h"
 
+#include "base/memory/scoped_vector.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/chromeos/test/test_display_snapshot.h"
 
 namespace ash {
 
@@ -14,18 +16,30 @@ namespace internal {
 
 namespace {
 
-ui::OutputConfigurator::OutputSnapshot CreateInternalSnapshot() {
-  ui::OutputConfigurator::OutputSnapshot output;
-  output.type = ui::OUTPUT_TYPE_INTERNAL;
+ui::TestDisplaySnapshot* CreateInternalSnapshot() {
+  ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
+  output->set_type(ui::OUTPUT_TYPE_INTERNAL);
   return output;
 }
 
-ui::OutputConfigurator::OutputSnapshot CreateVGASnapshot() {
-  ui::OutputConfigurator::OutputSnapshot output;
-  output.type = ui::OUTPUT_TYPE_VGA;
+ui::TestDisplaySnapshot* CreateVGASnapshot() {
+  ui::TestDisplaySnapshot* output = new ui::TestDisplaySnapshot();
+  output->set_type(ui::OUTPUT_TYPE_VGA);
   return output;
 }
 
+ui::OutputConfigurator::DisplayStateList CreateOutputs(
+    const ScopedVector<ui::TestDisplaySnapshot>& displays) {
+  ui::OutputConfigurator::DisplayStateList outputs;
+  for (size_t i = 0; i < displays.size(); ++i) {
+    ui::OutputConfigurator::DisplayState state;
+    state.display = displays[i];
+    outputs.push_back(state);
+  }
+
+  return outputs;
+}
+
 class ProjectingObserverTest : public testing::Test {
  public:
   ProjectingObserverTest() : observer_(new ProjectingObserver()) {
@@ -54,7 +68,8 @@ class ProjectingObserverTest : public testing::Test {
 }  // namespace
 
 TEST_F(ProjectingObserverTest, CheckNoDisplay) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -62,8 +77,9 @@ TEST_F(ProjectingObserverTest, CheckNoDisplay) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -71,8 +87,9 @@ TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -80,9 +97,10 @@ TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  displays.push_back(CreateVGASnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -91,9 +109,10 @@ TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  displays.push_back(CreateVGASnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
@@ -101,8 +120,9 @@ TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
@@ -113,8 +133,9 @@ TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
@@ -124,8 +145,9 @@ TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
 }
 
 TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
@@ -142,8 +164,9 @@ TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
 
 TEST_F(ProjectingObserverTest,
        CheckStopProjectingAfterClosingAllCastingSessions) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
@@ -155,9 +178,10 @@ TEST_F(ProjectingObserverTest,
 
 TEST_F(ProjectingObserverTest,
        CheckStopProjectingAfterDisconnectingSecondOutput) {
-  std::vector<ui::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  displays.push_back(CreateVGASnapshot());
+  ui::OutputConfigurator::DisplayStateList outputs = CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   // Remove VGA output.