Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_change_observer_chromeos_unittest.cc

Issue 1019623002: Remove DisplayState from the public interface for DisplayConfigurator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update ash_unittests Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/display/display_change_observer_chromeos.cc ('K') | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/projecting_observer_chromeos.cc » ('j') | ash/wm/lock_state_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos_unittest.cc
diff --git a/ash/display/display_change_observer_chromeos_unittest.cc b/ash/display/display_change_observer_chromeos_unittest.cc
index 7b18b080703f69c7ae2f24fdd7924c08f6a0246f..f43743756662019fda02ba8199a4fa58554f98a8 100644
--- a/ash/display/display_change_observer_chromeos_unittest.cc
+++ b/ash/display/display_change_observer_chromeos_unittest.cc
@@ -44,11 +44,9 @@ TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList) {
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);
@@ -78,7 +76,8 @@ TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList) {
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());
}
@@ -94,14 +93,12 @@ TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList) {
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);
@@ -139,15 +136,13 @@ TEST_F(DisplayChangeObserverTest, GetInternalHiDPIDisplayModeList) {
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);
@@ -198,15 +193,13 @@ TEST_F(DisplayChangeObserverTest, GetInternalDisplayModeList1_25) {
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);
@@ -263,11 +256,9 @@ TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList4K) {
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();
@@ -319,7 +310,8 @@ TEST_F(DisplayChangeObserverTest, GetExternalDisplayModeList4K) {
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());
}
@@ -372,11 +364,9 @@ TEST_F(DisplayChangeObserverTest,
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);
« ash/display/display_change_observer_chromeos.cc ('K') | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/projecting_observer_chromeos.cc » ('j') | ash/wm/lock_state_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698