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

Unified Diff: ui/display/chromeos/display_configurator_unittest.cc

Issue 463633005: On resume perform a delayed call to SetDisplayPower() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/display_configurator_unittest.cc
diff --git a/ui/display/chromeos/display_configurator_unittest.cc b/ui/display/chromeos/display_configurator_unittest.cc
index e55845f9e2e993f28ffac1d7aee94028df975345..9c24cb4b1192de6ab890f23bb10d8d0a8a26f9de 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -426,7 +426,7 @@ class DisplayConfiguratorTest : public testing::Test {
if (send_events) {
configurator_.OnConfigurationChanged();
- test_api_.TriggerConfigureTimeout();
+ EXPECT_TRUE(test_api_.TriggerConfigureTimeout());
}
}
@@ -848,6 +848,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
configurator_.SuspendDisplays();
EXPECT_EQ(kNoActions, log_->GetActionsAndClear());
configurator_.ResumeDisplays();
+ EXPECT_TRUE(test_api_.TriggerConfigureTimeout());
EXPECT_EQ(
JoinActions(
kGrab,
@@ -884,6 +885,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
log_->GetActionsAndClear());
configurator_.ResumeDisplays();
+ EXPECT_TRUE(test_api_.TriggerConfigureTimeout());
EXPECT_EQ(
JoinActions(
kGrab,
@@ -929,6 +931,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
// pick up the change.
UpdateOutputs(1, false);
configurator_.ResumeDisplays();
+ EXPECT_TRUE(test_api_.TriggerConfigureTimeout());
EXPECT_EQ(
JoinActions(
kGrab,
« no previous file with comments | « ui/display/chromeos/display_configurator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698