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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/projecting_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/projecting_observer_chromeos.cc ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | ash/wm/lock_state_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/projecting_observer_chromeos_unittest.cc
diff --git a/ash/display/projecting_observer_chromeos_unittest.cc b/ash/display/projecting_observer_chromeos_unittest.cc
index ebc888e2da50d66e3831b0f8bc6f0f2648fc38d6..06eb7986fb1a6af8690b44adde3567d933df5da4 100644
--- a/ash/display/projecting_observer_chromeos_unittest.cc
+++ b/ash/display/projecting_observer_chromeos_unittest.cc
@@ -24,18 +24,6 @@ ui::TestDisplaySnapshot* CreateVGASnapshot() {
return output;
}
-ui::DisplayConfigurator::DisplayStateList CreateOutputs(
- const ScopedVector<ui::TestDisplaySnapshot>& displays) {
- ui::DisplayConfigurator::DisplayStateList outputs;
- for (size_t i = 0; i < displays.size(); ++i) {
- ui::DisplayConfigurator::DisplayState state;
- state.display = displays[i];
- outputs.push_back(state);
- }
-
- return outputs;
-}
-
class ProjectingObserverTest : public testing::Test {
public:
ProjectingObserverTest() : observer_(&fake_power_client_) {}
@@ -53,40 +41,36 @@ class ProjectingObserverTest : public testing::Test {
} // namespace
TEST_F(ProjectingObserverTest, CheckNoDisplay) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ ScopedVector<ui::DisplaySnapshot> displays;
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(1, fake_power_client_.num_set_is_projecting_calls());
EXPECT_FALSE(fake_power_client_.is_projecting());
}
TEST_F(ProjectingObserverTest, CheckWithoutInternalDisplay) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateVGASnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(1, fake_power_client_.num_set_is_projecting_calls());
EXPECT_FALSE(fake_power_client_.is_projecting());
}
TEST_F(ProjectingObserverTest, CheckWithInternalDisplay) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(1, fake_power_client_.num_set_is_projecting_calls());
EXPECT_FALSE(fake_power_client_.is_projecting());
}
TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateVGASnapshot());
displays.push_back(CreateVGASnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(1, fake_power_client_.num_set_is_projecting_calls());
// We need at least 1 internal display to set projecting to on.
@@ -94,21 +78,19 @@ TEST_F(ProjectingObserverTest, CheckWithTwoVGADisplays) {
}
TEST_F(ProjectingObserverTest, CheckWithInternalAndVGADisplays) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
displays.push_back(CreateVGASnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(1, fake_power_client_.num_set_is_projecting_calls());
EXPECT_TRUE(fake_power_client_.is_projecting());
}
TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateVGASnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
observer_.OnCastingSessionStartedOrStopped(true);
@@ -118,10 +100,9 @@ TEST_F(ProjectingObserverTest, CheckWithVGADisplayAndOneCastingSession) {
}
TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
observer_.OnCastingSessionStartedOrStopped(true);
@@ -130,10 +111,9 @@ TEST_F(ProjectingObserverTest, CheckWithInternalDisplayAndOneCastingSession) {
}
TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
observer_.OnCastingSessionStartedOrStopped(true);
observer_.OnCastingSessionStartedOrStopped(true);
@@ -149,10 +129,9 @@ TEST_F(ProjectingObserverTest, CheckProjectingAfterClosingACastingSession) {
TEST_F(ProjectingObserverTest,
CheckStopProjectingAfterClosingAllCastingSessions) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
observer_.OnCastingSessionStartedOrStopped(true);
observer_.OnCastingSessionStartedOrStopped(false);
@@ -163,15 +142,14 @@ TEST_F(ProjectingObserverTest,
TEST_F(ProjectingObserverTest,
CheckStopProjectingAfterDisconnectingSecondOutput) {
- ScopedVector<ui::TestDisplaySnapshot> displays;
+ ScopedVector<ui::DisplaySnapshot> displays;
displays.push_back(CreateInternalSnapshot());
displays.push_back(CreateVGASnapshot());
- ui::DisplayConfigurator::DisplayStateList outputs = CreateOutputs(displays);
- observer_.OnDisplayModeChanged(outputs);
+ observer_.OnDisplayModeChanged(displays.get());
// Remove VGA output.
- outputs.erase(outputs.begin() + 1);
- observer_.OnDisplayModeChanged(outputs);
+ displays.erase(displays.begin() + 1);
+ observer_.OnDisplayModeChanged(displays.get());
EXPECT_EQ(2, fake_power_client_.num_set_is_projecting_calls());
EXPECT_FALSE(fake_power_client_.is_projecting());
« ash/display/display_change_observer_chromeos.cc ('K') | « ash/display/projecting_observer_chromeos.cc ('k') | ash/wm/lock_state_controller_unittest.cc » ('j') | ash/wm/lock_state_controller_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698