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

ash/system/chromeos/power/tablet_power_button_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/power/tablet_power_button_controller.h"
 
 #include <memory>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 210 matching lines @@
 // Tests tapping power button when device is suspended without backlights forced
 // off.
 TEST_F(TabletPowerButtonControllerTest,
        TappingPowerButtonWhenSuspendedWithoutBacklightsForcedOff) {
   power_manager_client_->SendSuspendImminent();
   power_manager_client_->SendBrightnessChanged(0, false);
   // There is a power button pressed here, but PowerButtonEvent is sent later.
   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());
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
 }
 
 // Tests tapping power button when device is suspended with backlights forced
 // off.
 TEST_F(TabletPowerButtonControllerTest,
        TappingPowerButtonWhenSuspendedWithBacklightsForcedOff) {
   PressPowerButton();
   ReleasePowerButton();
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
   power_manager_client_->SendSuspendImminent();
   // There is a power button pressed here, but PowerButtonEvent is sent later.
   // Because of backlights forced off, resuming system will not restore
   // 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());
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
 }
 
 // For convertible device working on laptop mode, tests keyboard/mouse event
 // when screen is off.
 TEST_F(TabletPowerButtonControllerTest, ConvertibleOnLaptopMode) {
@@ skipping 112 matching lines @@
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_TRUE(GetBacklightsForcedOff());
   EXPECT_FALSE(shell_delegate_->IsTouchscreenEnabledInPrefs(true));
   generator_->MoveMouseBy(1, 1);
   power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false);
   EXPECT_TRUE(shell_delegate_->IsTouchscreenEnabledInPrefs(true));
 }
 
 }  // namespace test
 }  // namespace ash