Refactoring display configuration state to allow generic state objects

ash/display/projecting_observer_chromeos_unittest.cc

 // Copyright 2014 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/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 {
 
 namespace internal {
 
 namespace {
 
-chromeos::OutputConfigurator::OutputSnapshot CreateInternalSnapshot() {
-  chromeos::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;
 }
 
-chromeos::OutputConfigurator::OutputSnapshot CreateVGASnapshot() {
-  chromeos::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;
 }
 
+std::vector<chromeos::OutputConfigurator::InternalDisplayState> CreateOutputs(
+    const ScopedVector<ui::TestDisplaySnapshot>& displays) {
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs;
+  for (size_t i = 0; i < displays.size(); ++i) {
+    chromeos::OutputConfigurator::InternalDisplayState state;
+    state.display = displays[i];
+    outputs.push_back(state);
+  }
+
+  return outputs;
+}
+
 class ProjectingObserverTest : public testing::Test {
  public:
   ProjectingObserverTest() : observer_(new ProjectingObserver()) {
     chromeos::FakeDBusThreadManager* dbus_manager =
         new chromeos::FakeDBusThreadManager();
     fake_power_client_ = new chromeos::FakePowerManagerClient();
 
     dbus_manager->SetPowerManagerClient(
         scoped_ptr<chromeos::PowerManagerClient>(fake_power_client_));
 
     // Takes ownership of |dbus_manager|.
     chromeos::DBusThreadManager::InitializeForTesting(dbus_manager);
   }
 
   virtual ~ProjectingObserverTest() {
     chromeos::DBusThreadManager::Shutdown();
   }
 
  protected:
   scoped_ptr<ProjectingObserver> observer_;
   chromeos::FakePowerManagerClient* fake_power_client_;  //  Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(ProjectingObserverTest);
 };
 
 }  // namespace
 
 TEST_F(ProjectingObserverTest, CheckNoDisplay) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  displays.push_back(CreateVGASnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
   // We need at least 1 internal display to set projecting to on.
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  displays.push_back(CreateVGASnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(1, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_TRUE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateVGASnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
 
   EXPECT_EQ(2, fake_power_client_->num_set_is_projecting_calls());
   // Need at least one internal display to set projecting state to |true|.
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
 
   EXPECT_EQ(2, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_TRUE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
   observer_->OnCastingSessionStartedOrStopped(true);
 
   EXPECT_EQ(3, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_TRUE(fake_power_client_->is_projecting());
 
   observer_->OnCastingSessionStartedOrStopped(false);
 
   EXPECT_EQ(4, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_TRUE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest,
        CheckStopProjectingAfterClosingAllCastingSessions) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   observer_->OnCastingSessionStartedOrStopped(true);
   observer_->OnCastingSessionStartedOrStopped(false);
 
   EXPECT_EQ(3, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 TEST_F(ProjectingObserverTest,
        CheckStopProjectingAfterDisconnectingSecondOutput) {
-  std::vector<chromeos::OutputConfigurator::OutputSnapshot> outputs;
-  outputs.push_back(CreateInternalSnapshot());
-  outputs.push_back(CreateVGASnapshot());
+  ScopedVector<ui::TestDisplaySnapshot> displays;
+  displays.push_back(CreateInternalSnapshot());
+  displays.push_back(CreateVGASnapshot());
+  std::vector<chromeos::OutputConfigurator::InternalDisplayState> outputs =
+      CreateOutputs(displays);
   observer_->OnDisplayModeChanged(outputs);
 
   // Remove VGA output.
   outputs.erase(outputs.begin() + 1);
   observer_->OnDisplayModeChanged(outputs);
 
   EXPECT_EQ(2, fake_power_client_->num_set_is_projecting_calls());
   EXPECT_FALSE(fake_power_client_->is_projecting());
 }
 
 }  // namespace internal
 
 }  // namespace ash