On resume perform a delayed call to SetDisplayPower()

ui/display/chromeos/display_configurator_unittest.cc

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..f24ddb581ae668e809afcbd9ddbb22ae5d83aa47 100644
--- a/ui/display/chromeos/display_configurator_unittest.cc
+++ b/ui/display/chromeos/display_configurator_unittest.cc
@@ -848,6 +848,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
   configurator_.SuspendDisplays();
   EXPECT_EQ(kNoActions, log_->GetActionsAndClear());
   configurator_.ResumeDisplays();
+  test_api_.TriggerConfigureTimeout();

[Daniel Erat, 2014/08/12 21:00:04]

you should be testing the return value here to verify that the timer was
actually running. please also annotate this method with WARN_UNUSED_RESULT.

[dnicoara, 2014/08/12 21:46:20]

Done.

   EXPECT_EQ(
       JoinActions(
           kGrab,
@@ -884,6 +885,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
       log_->GetActionsAndClear());
 
   configurator_.ResumeDisplays();
+  test_api_.TriggerConfigureTimeout();
   EXPECT_EQ(
       JoinActions(
           kGrab,
@@ -929,6 +931,7 @@ TEST_F(DisplayConfiguratorTest, SuspendAndResume) {
   // pick up the change.
   UpdateOutputs(1, false);
   configurator_.ResumeDisplays();
+  test_api_.TriggerConfigureTimeout();
   EXPECT_EQ(
       JoinActions(
           kGrab,