Delete TestDisplaySnapshot and update tests.

ui/display/chromeos/update_display_configuration_task_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 "ui/display/chromeos/update_display_configuration_task.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
-#include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/chromeos/test/test_native_display_delegate.h"
+#include "ui/display/fake_display_snapshot.h"
 
 namespace ui {
 namespace test {
 
 namespace {
 
 class TestSoftwareMirroringController
     : public DisplayConfigurator::SoftwareMirroringController {
  public:
   TestSoftwareMirroringController() : is_enabled_(false) {}
@@ skipping 116 matching lines @@
 class UpdateDisplayConfigurationTaskTest : public testing::Test {
  public:
   UpdateDisplayConfigurationTaskTest()
       : delegate_(&log_),
         small_mode_(gfx::Size(1366, 768), false, 60.0f),
         big_mode_(gfx::Size(2560, 1600), false, 60.0f),
         configured_(false),
         configuration_status_(false),
         display_state_(MULTIPLE_DISPLAY_STATE_INVALID),
         power_state_(chromeos::DISPLAY_POWER_ALL_ON) {
-    std::vector<std::unique_ptr<const DisplayMode>> modes;
-    modes.push_back(small_mode_.Clone());
-    displays_[0].set_current_mode(modes[0].get());
-    displays_[0].set_native_mode(modes[0].get());
-    displays_[0].set_modes(std::move(modes));
-    displays_[0].set_display_id(123);
+    displays_[0] = display::FakeDisplaySnapshot::Builder()
+                       .SetId(123)
+                       .SetNativeMode(small_mode_.Clone())
+                       .SetCurrentMode(small_mode_.Clone())
+                       .Build();
 
-    modes.clear();
-    modes.push_back(small_mode_.Clone());
-    modes.push_back(big_mode_.Clone());
-    displays_[1].set_current_mode(modes[1].get());
-    displays_[1].set_native_mode(modes[1].get());
-    displays_[1].set_modes(std::move(modes));
-    displays_[1].set_display_id(456);
+    displays_[1] = display::FakeDisplaySnapshot::Builder()
+                       .SetId(456)
+                       .SetNativeMode(big_mode_.Clone())
+                       .SetCurrentMode(big_mode_.Clone())
+                       .AddMode(small_mode_.Clone())
+                       .Build();
   }
   ~UpdateDisplayConfigurationTaskTest() override {}
 
   void UpdateDisplays(size_t count) {
     std::vector<DisplaySnapshot*> displays;
     for (size_t i = 0; i < count; ++i)
-      displays.push_back(&displays_[i]);
+      displays.push_back(displays_[i].get());
 
     delegate_.set_outputs(displays);
   }
 
   void ResponseCallback(bool success,
                         const std::vector<DisplaySnapshot*>& displays,
                         const gfx::Size& framebuffer_size,
                         MultipleDisplayState new_display_state,
                         chromeos::DisplayPowerState new_power_state) {
     configured_ = true;
     configuration_status_ = success;
     display_states_ = displays;
     display_state_ = new_display_state;
     power_state_ = new_power_state;
 
     if (success) {
       layout_manager_.set_display_state(display_state_);
       layout_manager_.set_power_state(power_state_);
     }
   }
 
  protected:
   ActionLogger log_;
   TestNativeDisplayDelegate delegate_;
   TestDisplayLayoutManager layout_manager_;
 
   const DisplayMode small_mode_;
   const DisplayMode big_mode_;
 
-  TestDisplaySnapshot displays_[2];
+  std::unique_ptr<DisplaySnapshot> displays_[2];
 
   bool configured_;
   bool configuration_status_;
   std::vector<DisplaySnapshot*> display_states_;
   MultipleDisplayState display_state_;
   chromeos::DisplayPowerState power_state_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UpdateDisplayConfigurationTaskTest);
 };
 
 }  // namespace
 
 TEST_F(UpdateDisplayConfigurationTaskTest, HeadlessConfiguration) {
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_HEADLESS,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_HEADLESS, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON, power_state_);
-  EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), log_.GetActionsAndClear());
+  EXPECT_EQ(JoinActions(kGrab, kUngrab, nullptr), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, SingleConfiguration) {
   UpdateDisplays(1);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON, power_state_);
-  EXPECT_EQ(JoinActions(
-                kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
-                                            nullptr).c_str(),
-                GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-                kUngrab, NULL),
-            log_.GetActionsAndClear());
+  EXPECT_EQ(
+      JoinActions(
+          kGrab,
+          GetFramebufferAction(small_mode_.size(), displays_[0].get(), nullptr)
+              .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          kUngrab, nullptr),
+      log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, ExtendedConfiguration) {
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON, power_state_);
   EXPECT_EQ(
       JoinActions(
           kGrab, GetFramebufferAction(gfx::Size(big_mode_.size().width(),
                                                 small_mode_.size().height() +
                                                     big_mode_.size().height()),
-                                      &displays_[0], &displays_[1]).c_str(),
-          GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-          GetCrtcAction(displays_[1], &big_mode_,
-                        gfx::Point(0, small_mode_.size().height())).c_str(),
-          kUngrab, NULL),
+                                      displays_[0].get(), displays_[1].get())
+                     .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          GetCrtcAction(*displays_[1], &big_mode_,
+                        gfx::Point(0, small_mode_.size().height()))
+              .c_str(),
+          kUngrab, nullptr),
       log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, MirrorConfiguration) {
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_MIRROR, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON, power_state_);
-  EXPECT_EQ(JoinActions(
-                kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
-                                            &displays_[1]).c_str(),
-                GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-                GetCrtcAction(displays_[1], &small_mode_, gfx::Point()).c_str(),
-                kUngrab, NULL),
-            log_.GetActionsAndClear());
+  EXPECT_EQ(
+      JoinActions(
+          kGrab, GetFramebufferAction(small_mode_.size(), displays_[0].get(),
+                                      displays_[1].get())
+                     .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          GetCrtcAction(*displays_[1], &small_mode_, gfx::Point()).c_str(),
+          kUngrab, nullptr),
+      log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, FailMirrorConfiguration) {
   layout_manager_.set_should_mirror(false);
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_MIRROR,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_FALSE(configuration_status_);
-  EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), log_.GetActionsAndClear());
+  EXPECT_EQ(JoinActions(kGrab, kUngrab, nullptr), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, FailExtendedConfiguration) {
   delegate_.set_max_configurable_pixels(1);
   UpdateDisplays(2);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_FALSE(configuration_status_);
   EXPECT_EQ(
       JoinActions(
           kGrab, GetFramebufferAction(gfx::Size(big_mode_.size().width(),
                                                 small_mode_.size().height() +
                                                     big_mode_.size().height()),
-                                      &displays_[0], &displays_[1]).c_str(),
-          GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-          GetCrtcAction(displays_[1], &big_mode_,
-                        gfx::Point(0, small_mode_.size().height())).c_str(),
-          GetCrtcAction(displays_[1], &small_mode_,
-                        gfx::Point(0, small_mode_.size().height())).c_str(),
-          kUngrab, NULL),
+                                      displays_[0].get(), displays_[1].get())
+                     .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          GetCrtcAction(*displays_[1], &big_mode_,
+                        gfx::Point(0, small_mode_.size().height()))
+              .c_str(),
+          GetCrtcAction(*displays_[1], &small_mode_,
+                        gfx::Point(0, small_mode_.size().height()))
+              .c_str(),
+          kUngrab, nullptr),
       log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, SingleChangePowerConfiguration) {
   UpdateDisplays(1);
 
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configured_);
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_ON, power_state_);
-  EXPECT_EQ(JoinActions(
-                kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
-                                            nullptr).c_str(),
-                GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-                kUngrab, NULL),
-            log_.GetActionsAndClear());
+  EXPECT_EQ(
+      JoinActions(
+          kGrab,
+          GetFramebufferAction(small_mode_.size(), displays_[0].get(), nullptr)
+              .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          kUngrab, nullptr),
+      log_.GetActionsAndClear());
 
   // Turn power off
   {
     UpdateDisplayConfigurationTask task(
         &delegate_, &layout_manager_, MULTIPLE_DISPLAY_STATE_SINGLE,
         chromeos::DISPLAY_POWER_ALL_OFF, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_SINGLE, display_state_);
   EXPECT_EQ(chromeos::DISPLAY_POWER_ALL_OFF, power_state_);
   EXPECT_EQ(
-      JoinActions(kGrab, GetFramebufferAction(small_mode_.size(), &displays_[0],
-                                              nullptr).c_str(),
-                  GetCrtcAction(displays_[0], nullptr, gfx::Point()).c_str(),
-                  kUngrab, NULL),
+      JoinActions(kGrab, GetFramebufferAction(small_mode_.size(),
+                                              displays_[0].get(), nullptr)
+                             .c_str(),
+                  GetCrtcAction(*displays_[0], nullptr, gfx::Point()).c_str(),
+                  kUngrab, nullptr),
       log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest, NoopSoftwareMirrorConfiguration) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
       base::MakeUnique<TestSoftwareMirroringController>());
   UpdateDisplays(2);
 
   {
@@ skipping 13 matching lines @@
         chromeos::DISPLAY_POWER_ALL_ON, 0, 0, false,
         base::Bind(&UpdateDisplayConfigurationTaskTest::ResponseCallback,
                    base::Unretained(this)));
     task.Run();
   }
 
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
               ->SoftwareMirroringEnabled());
-  EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), log_.GetActionsAndClear());
+  EXPECT_EQ(JoinActions(kGrab, kUngrab, nullptr), log_.GetActionsAndClear());
 }
 
 TEST_F(UpdateDisplayConfigurationTaskTest,
        ForceConfigurationWhileGoingToSoftwareMirror) {
   layout_manager_.set_should_mirror(false);
   layout_manager_.set_software_mirroring_controller(
       base::MakeUnique<TestSoftwareMirroringController>());
   UpdateDisplays(2);
 
   {
@@ skipping 18 matching lines @@
 
   EXPECT_TRUE(configuration_status_);
   EXPECT_EQ(MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED, display_state_);
   EXPECT_TRUE(layout_manager_.GetSoftwareMirroringController()
               ->SoftwareMirroringEnabled());
   EXPECT_EQ(
       JoinActions(
           kGrab, GetFramebufferAction(gfx::Size(big_mode_.size().width(),
                                                 small_mode_.size().height() +
                                                     big_mode_.size().height()),
-                                      &displays_[0], &displays_[1]).c_str(),
-          GetCrtcAction(displays_[0], &small_mode_, gfx::Point()).c_str(),
-          GetCrtcAction(displays_[1], &big_mode_,
-                        gfx::Point(0, small_mode_.size().height())).c_str(),
-          kUngrab, NULL),
+                                      displays_[0].get(), displays_[1].get())
+                     .c_str(),
+          GetCrtcAction(*displays_[0], &small_mode_, gfx::Point()).c_str(),
+          GetCrtcAction(*displays_[1], &big_mode_,
+                        gfx::Point(0, small_mode_.size().height()))
+              .c_str(),
+          kUngrab, nullptr),
       log_.GetActionsAndClear());
 }
 
 }  // namespace test
 }  // namespace ui