Remove DisplayState from the public interface for DisplayConfigurator

ash/display/display_change_observer_chromeos_unittest.cc

 // Copyright 2013 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/display_change_observer_chromeos.h"
 
 #include "ash/display/display_info.h"
 #include "base/memory/scoped_vector.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/chromeos/display_configurator.h"
@@ skipping 26 matching lines @@
   // Mixed.
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), true, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 70));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
   modes.push_back(new ui::DisplayMode(gfx::Size(640, 480), true, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetExternalDisplayModeList(output);
+      DisplayChangeObserver::GetExternalDisplayModeList(display_snapshot);
   ASSERT_EQ(6u, display_modes.size());
   EXPECT_EQ("640x480", display_modes[0].size.ToString());
   EXPECT_TRUE(display_modes[0].interlaced);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1024x600", display_modes[1].size.ToString());
   EXPECT_FALSE(display_modes[1].interlaced);
   EXPECT_EQ(display_modes[1].refresh_rate, 70);
 
   EXPECT_EQ("1024x768", display_modes[2].size.ToString());
   EXPECT_TRUE(display_modes[2].interlaced);
   EXPECT_EQ(display_modes[2].refresh_rate, 70);
 
   EXPECT_EQ("1280x720", display_modes[3].size.ToString());
   EXPECT_FALSE(display_modes[3].interlaced);
   EXPECT_EQ(display_modes[3].refresh_rate, 60);
 
   EXPECT_EQ("1920x1080", display_modes[4].size.ToString());
   EXPECT_FALSE(display_modes[4].interlaced);
   EXPECT_EQ(display_modes[4].refresh_rate, 80);
 
   EXPECT_EQ("1920x1200", display_modes[5].size.ToString());
   EXPECT_FALSE(display_modes[5].interlaced);
   EXPECT_EQ(display_modes[5].refresh_rate, 60);
 
   // Outputs without any modes shouldn't cause a crash.
   modes.clear();
   display_snapshot.set_modes(modes.get());
 
-  display_modes = DisplayChangeObserver::GetExternalDisplayModeList(output);
+  display_modes =
+      DisplayChangeObserver::GetExternalDisplayModeList(display_snapshot);
   EXPECT_EQ(0u, display_modes.size());
 }
 
 TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList) {
   ScopedVector<const ui::DisplayMode> modes;
   // Data picked from peppy.
   modes.push_back(new ui::DisplayMode(gfx::Size(1366, 768), false, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 768), false, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(800, 600), false, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(600, 600), false, 56.2));
   modes.push_back(new ui::DisplayMode(gfx::Size(640, 480), false, 59.9));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(modes[0]);
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   DisplayInfo info;
   info.SetBounds(gfx::Rect(0, 0, 1366, 768));
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetInternalDisplayModeList(info, output);
+      DisplayChangeObserver::GetInternalDisplayModeList(info, display_snapshot);
   ASSERT_EQ(5u, display_modes.size());
   EXPECT_EQ("1366x768", display_modes[0].size.ToString());
   EXPECT_FALSE(display_modes[0].native);
   EXPECT_NEAR(display_modes[0].ui_scale, 0.5, 0.01);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1366x768", display_modes[1].size.ToString());
   EXPECT_FALSE(display_modes[1].native);
   EXPECT_NEAR(display_modes[1].ui_scale, 0.6, 0.01);
   EXPECT_EQ(display_modes[1].refresh_rate, 60);
@@ skipping 17 matching lines @@
 TEST_F(DisplayChangeObserverTest, GetInternalHiDPIDisplayModeList) {
   ScopedVector<const ui::DisplayMode> modes;
   // Data picked from peppy.
   modes.push_back(new ui::DisplayMode(gfx::Size(2560, 1700), false, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(2048, 1536), false, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1440), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(modes[0]);
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   DisplayInfo info;
   info.SetBounds(gfx::Rect(0, 0, 2560, 1700));
   info.set_device_scale_factor(2.0f);
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetInternalDisplayModeList(info, output);
+      DisplayChangeObserver::GetInternalDisplayModeList(info, display_snapshot);
   ASSERT_EQ(8u, display_modes.size());
   EXPECT_EQ("2560x1700", display_modes[0].size.ToString());
   EXPECT_FALSE(display_modes[0].native);
   EXPECT_NEAR(display_modes[0].ui_scale, 0.5, 0.01);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("2560x1700", display_modes[1].size.ToString());
   EXPECT_FALSE(display_modes[1].native);
   EXPECT_NEAR(display_modes[1].ui_scale, 0.625, 0.01);
   EXPECT_EQ(display_modes[1].refresh_rate, 60);
@@ skipping 30 matching lines @@
 }
 
 TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList1_25) {
   ScopedVector<const ui::DisplayMode> modes;
   // Data picked from peppy.
   modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(modes[0]);
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   DisplayInfo info;
   info.SetBounds(gfx::Rect(0, 0, 1920, 1080));
   info.set_device_scale_factor(1.25);
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetInternalDisplayModeList(info, output);
+      DisplayChangeObserver::GetInternalDisplayModeList(info, display_snapshot);
   ASSERT_EQ(5u, display_modes.size());
   EXPECT_EQ("1920x1080", display_modes[0].size.ToString());
   EXPECT_FALSE(display_modes[0].native);
   EXPECT_NEAR(display_modes[0].ui_scale, 0.5, 0.01);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1920x1080", display_modes[1].size.ToString());
   EXPECT_FALSE(display_modes[1].native);
   EXPECT_NEAR(display_modes[1].ui_scale, 0.625, 0.01);
   EXPECT_EQ(display_modes[1].refresh_rate, 60);
@@ skipping 36 matching lines @@
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), true, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 70));
   modes.push_back(new ui::DisplayMode(gfx::Size(1024, 600), false, 60));
 
   // Just one interlaced mode.
   modes.push_back(new ui::DisplayMode(gfx::Size(640, 480), true, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(modes[0]);
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetExternalDisplayModeList(output);
+      DisplayChangeObserver::GetExternalDisplayModeList(display_snapshot);
   DisplayInfo info;
   info.SetDisplayModes(display_modes);  // Sort as external display.
   display_modes = info.display_modes();
 
   ASSERT_EQ(9u, display_modes.size());
   EXPECT_EQ("640x480", display_modes[0].size.ToString());
   EXPECT_TRUE(display_modes[0].interlaced);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1024x600", display_modes[1].size.ToString());
@@ skipping 31 matching lines @@
   EXPECT_EQ("3840x2160", display_modes[8].size.ToString());
   EXPECT_FALSE(display_modes[8].interlaced);
   EXPECT_TRUE(display_modes[8].native);
   EXPECT_EQ(display_modes[8].refresh_rate, 30);
 
   // Outputs without any modes shouldn't cause a crash.
   modes.clear();
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(NULL);
 
-  display_modes = DisplayChangeObserver::GetExternalDisplayModeList(output);
+  display_modes =
+      DisplayChangeObserver::GetExternalDisplayModeList(display_snapshot);
   EXPECT_EQ(0u, display_modes.size());
 }
 
 namespace {
 
 float ComputeDeviceScaleFactor(float diagonal_inch,
                                const gfx::Rect& resolution) {
   // We assume that displays have square pixel.
   float diagonal_pixel = std::sqrt(std::pow(resolution.width(), 2) +
                                    std::pow(resolution.height(), 2));
@@ skipping 32 matching lines @@
 
 TEST_F(DisplayChangeObserverTest,
        FindExternalDisplayNativeModeWhenOverwritten) {
   ScopedVector<const ui::DisplayMode> modes;
   modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), true, 60));
   modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60));
 
   ui::TestDisplaySnapshot display_snapshot;
   display_snapshot.set_modes(modes.get());
   display_snapshot.set_native_mode(modes[0]);
-  DisplayConfigurator::DisplayState output;
-  output.display = &display_snapshot;
 
   std::vector<DisplayMode> display_modes =
-      DisplayChangeObserver::GetExternalDisplayModeList(output);
+      DisplayChangeObserver::GetExternalDisplayModeList(display_snapshot);
   ASSERT_EQ(2u, display_modes.size());
   EXPECT_EQ("1920x1080", display_modes[0].size.ToString());
   EXPECT_FALSE(display_modes[0].interlaced);
   EXPECT_FALSE(display_modes[0].native);
   EXPECT_EQ(display_modes[0].refresh_rate, 60);
 
   EXPECT_EQ("1920x1080", display_modes[1].size.ToString());
   EXPECT_TRUE(display_modes[1].interlaced);
   EXPECT_TRUE(display_modes[1].native);
   EXPECT_EQ(display_modes[1].refresh_rate, 60);
 }
 
 }  // namespace ash