Add support for a virtual display on ChromeOS

ui/display/chromeos/display_configurator_unittest.cc

Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index 86b147338ec939a4595f929a6f4fb490d1ac79a1..2c663408604c26680b6761e9f64b9de0997042a7 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -304,6 +304,57 @@ TEST_F(DisplayConfiguratorTest, FindDisplayModeMatchingSize) {
                 output, gfx::Size(1440, 900)));
 }
 
+TEST_F(DisplayConfiguratorTest, EnableVirtualDisplay) {
+  InitWithSingleOutput();
+
+  observer_.Reset();
+  const DisplayConfigurator::DisplayStateList* cached =
+      &configurator_.cached_displays();
+  ASSERT_EQ(static_cast<size_t>(1), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0].display->current_mode()->size());
+
+  // Add virtual display.
+  configurator_.EnableVirtualDisplay(make_scoped_ptr(new ui::DisplayMode(
+      big_mode_.size(), big_mode_.is_interlaced(), big_mode_.refresh_rate())));
+  EXPECT_FALSE(mirroring_controller_.SoftwareMirroringEnabled());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
+            configurator_.display_state());
+
+  // Virtual should not trigger addition of added crtc but does change FB
+  // height.
+  const int kDualHeight = small_mode_.size().height() +
+                          DisplayConfigurator::kVerticalGap +
+                          big_mode_.size().height();
+  EXPECT_EQ(
+      JoinActions(
+          kGrab,
+          GetFramebufferAction(gfx::Size(big_mode_.size().width(), kDualHeight),
+                               &outputs_[0], NULL).c_str(),
+          GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(),
+          kUngrab, NULL),
+      log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  cached = &configurator_.cached_displays();
+  ASSERT_EQ(static_cast<size_t>(2), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0].display->current_mode()->size());
+  EXPECT_EQ(big_mode_.size(), (*cached)[1].display->current_mode()->size());
+
+  // Remove virtual display.
+  observer_.Reset();
+  configurator_.DisableVirtualDisplay();
+  EXPECT_EQ(JoinActions(kGrab, GetFramebufferAction(small_mode_.size(),
+                                                    &outputs_[0], NULL).c_str(),
+                        GetCrtcAction(outputs_[0], &small_mode_,
+                                      gfx::Point(0, 0)).c_str(),
+                        kUngrab, NULL),
+            log_->GetActionsAndClear());
+  EXPECT_EQ(1, observer_.num_changes());
+  cached = &configurator_.cached_displays();
+  ASSERT_EQ(static_cast<size_t>(1), cached->size());
+  EXPECT_EQ(small_mode_.size(), (*cached)[0].display->current_mode()->size());
+  EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, configurator_.display_state());
+}
+
 TEST_F(DisplayConfiguratorTest, ConnectSecondOutput) {
   InitWithSingleOutput();