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 aaee7b526b67f0730ee70d3bac89e44ff0a0982c..914b461f8e85dd79d6a1584a9aff91a4a5ce9520 100644 |
--- a/ui/display/chromeos/display_configurator_unittest.cc |
+++ b/ui/display/chromeos/display_configurator_unittest.cc |
@@ -851,11 +851,16 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) { |
NULL), |
log_->GetActionsAndClear()); |
configurator_.ResumeDisplays(); |
+ |
+ // Expect the GetFramebuffer and GetCrtc actions to happen twice since we |
+ // configure the cached displays on resume to speed things up. |
EXPECT_EQ( |
JoinActions( |
kGrab, |
GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(), |
GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(), |
+ GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(), |
+ GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(), |
kForceDPMS, |
kUngrab, |
NULL), |
@@ -1295,11 +1300,16 @@ TEST_F(DisplayConfiguratorTest, DoNotConfigureWithSuspendedDisplays) { |
EXPECT_EQ(kNoActions, log_->GetActionsAndClear()); |
configurator_.ResumeDisplays(); |
+ |
+ // Expect the GetFramebuffer and GetCrtc actions to happen twice since we |
+ // configure the cached displays on resume to speed things up. |
EXPECT_EQ( |
JoinActions( |
kGrab, |
GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(), |
GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(), |
+ GetFramebufferAction(small_mode_.size(), &outputs_[0], NULL).c_str(), |
+ GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(), |
kForceDPMS, |
kUngrab, |
NULL), |