ash: Start shutdown timer on post-resume power button press

ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

Index: ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
diff --git a/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc b/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
index a27af600e2ce450afb8e11bf69f96a0326d3beb9..e9a5e43bb1dfa0f83dde7fc5986390d5a8caacbc 100644
--- a/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
+++ b/ash/system/chromeos/power/tablet_power_button_controller_unittest.cc
@@ -228,15 +228,15 @@ TEST_F(TabletPowerButtonControllerTest,
   power_manager_client_->SendSuspendDone();
   power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false);
 
-  // Send the power button event after a short delay and check that it is
-  // ignored.
+  // Send the power button event after a short delay and check that backlights
+  // are not forced off.
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(500));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
   EXPECT_FALSE(GetBacklightsForcedOff());
 
-  // Send the power button event after a longer delay and check that it is not
-  // ignored.
+  // Send the power button event after a longer delay and check that backlights
+  // are forced off.
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(1600));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
@@ -258,16 +258,16 @@ TEST_F(TabletPowerButtonControllerTest,
   // brightness.
   power_manager_client_->SendSuspendDone();
 
-  // Send the power button event after a short delay and check that it is
-  // ignored. But if backlights are forced off, stop forcing off.
+  // Send the power button event after a short delay and check that backlights
+  // are not forced off.
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(500));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false);
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
   EXPECT_FALSE(GetBacklightsForcedOff());
 
-  // Send the power button event after a longer delay and check that it is not
-  // ignored.
+  // Send the power button event after a longer delay and check that backlights
+  // are forced off.

[Daniel Erat, 2016/12/05 17:26:00]

it looks like you're only updating comments. can you add a test for the updated
behavior?

[Qiang(Joe) Xu, 2016/12/05 19:33:59]

Done.

   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(1600));
   power_manager_client_->SendPowerButtonEvent(true, tick_clock_->NowTicks());
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());