chromeos: Clean up DisplayErrorObserverTest

Use FakeDisplaySnapshot::Builder to avoid the very-long argument list
for DisplaySnapshot.

Fix include-what-you-use.

Bug: none
Change-Id: I83f5f1d0a240c9e589d5de1baa6bd2159127a1d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761445Reviewed-by: Miguel Casas <mcasas@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688736}

ash/display/display_error_observer_unittest.cc

@@ -4,45 +4,20 @@
 
 #include "ash/display/display_error_observer.h"
 
+#include <memory>
+
 #include "ash/display/display_util.h"
-#include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/test/ash_test_base.h"
-#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/chromeos/devicetype_utils.h"
+#include "ui/display/fake/fake_display_snapshot.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/display/types/display_snapshot.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget.h"
 
 namespace ash {
 
-namespace {
-
-std::unique_ptr<display::DisplaySnapshot> CreateTestDisplaySnapshot(
-    int64_t id,
-    const gfx::Size& size,
-    display::DisplayConnectionType type) {
-  return std::make_unique<display::DisplaySnapshot>(
-      id, gfx::Point(0, 0) /* origin */, size, type,
-      false /* is_aspect_preserving_scaling */, false /* has_overscan */,
-      false /* has_color_correction_matrix */,
-      false /* color_correction_in_linear_space */,
-      gfx::ColorSpace() /* color_space */, std::string() /* display_name */,
-      base::FilePath() /* sys_path */,
-      display::DisplaySnapshot::DisplayModeList() /* modes */,
-      display::PanelOrientation::kNormal /* panel_orientation */,
-      std::vector<uint8_t>() /* edid */, nullptr /* current_mode */,
-      nullptr /* native_mode */, 0 /* product_id */,
-      display::kInvalidYearOfManufacture,
-      gfx::Size() /* maximum_cursor_size */);
-}
-
-}  // namespace
-
 class DisplayErrorObserverTest : public AshTestBase {
  protected:
   DisplayErrorObserverTest() = default;
@@ -51,7 +26,7 @@ class DisplayErrorObserverTest : public AshTestBase {
 
   void SetUp() override {
     AshTestBase::SetUp();
-    observer_.reset(new DisplayErrorObserver());
+    observer_ = std::make_unique<DisplayErrorObserver>();
   }
 
  protected:
@@ -115,19 +90,22 @@ TEST_F(DisplayErrorObserverTest, FailureWithInternalDisplay) {
   const int64_t external_display_id = display_manager()->GetDisplayAt(1).id();
   display::test::ScopedSetInternalDisplayId set_internal(display_manager(),
                                                          internal_display_id);
-  auto snapshot1 =
-      CreateTestDisplaySnapshot(internal_display_id, {200, 200},
-                                display::DISPLAY_CONNECTION_TYPE_INTERNAL);
-
+  auto snapshot1 = display::FakeDisplaySnapshot::Builder()
+                       .SetId(internal_display_id)
+                       .SetNativeMode({200, 200})
+                       .SetType(display::DISPLAY_CONNECTION_TYPE_INTERNAL)
+                       .Build();
   observer()->OnDisplayModeChangeFailed(
       {snapshot1.get()}, display::MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED);
   EXPECT_TRUE(GetMessageContents().empty());
 
   // Failure in both displays, user will see a notification even though one of
   // them is the internal display.
-  auto snapshot2 =
-      CreateTestDisplaySnapshot(external_display_id, {300, 300},
-                                display::DISPLAY_CONNECTION_TYPE_UNKNOWN);
+  auto snapshot2 = display::FakeDisplaySnapshot::Builder()
+                       .SetId(external_display_id)
+                       .SetNativeMode({300, 300})
+                       .SetType(display::DISPLAY_CONNECTION_TYPE_UNKNOWN)
+                       .Build();
   observer()->OnDisplayModeChangeFailed(
       {snapshot1.get(), snapshot2.get()},
       display::MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED);