Revert "ash: Add one second grace period For LockScreenIfRequired"

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 121 matching lines @@
 
 TEST_F(TabletPowerButtonControllerTest, LockScreenIfRequired) {
   Initialize(LoginStatus::USER);
   SetShouldLockScreenAutomatically(true);
   EXPECT_FALSE(GetLockedState());
 
   // On User logged in status, power-button-press-release should lock screen if
   // automatic screen-locking was requested.
   PressPowerButton();
   ReleasePowerButton();
-  EXPECT_TRUE(test_api_->LockScreenTimerIsRunning());
-  EXPECT_FALSE(GetLockedState());
-  test_api_->TriggerLockScreenTimeout();
   EXPECT_TRUE(GetLockedState());
 
   // On locked state, power-button-press-release should do nothing.
   PressPowerButton();
   ReleasePowerButton();
-  EXPECT_FALSE(test_api_->LockScreenTimerIsRunning());
   EXPECT_TRUE(GetLockedState());
 
   // Unlock the sceen.
   UnlockScreen();
   ASSERT_FALSE(GetLockedState());
 
   // power-button-press-release should not lock the screen if automatic
   // screen-locking wasn't requested.
   SetShouldLockScreenAutomatically(false);
   PressPowerButton();
   ReleasePowerButton();
-  EXPECT_FALSE(test_api_->LockScreenTimerIsRunning());
   EXPECT_FALSE(GetLockedState());
 }
 
-// Tests when display is on, quickly tapping power button two times, screen is
-// not locked.
-TEST_F(TabletPowerButtonControllerTest, LockScreenGracePeriodTest) {
-  Initialize(LoginStatus::USER);
-  SetShouldLockScreenAutomatically(true);
-  EXPECT_FALSE(GetLockedState());
-
-  PressPowerButton();
-  ReleasePowerButton();
-  power_manager_client_->SendBrightnessChanged(0, false);
-  EXPECT_TRUE(test_api_->LockScreenTimerIsRunning());
-  PressPowerButton();
-  power_manager_client_->SendBrightnessChanged(kNonZeroBrightness, false);
-  EXPECT_FALSE(test_api_->LockScreenTimerIsRunning());
-  ReleasePowerButton();
-  EXPECT_FALSE(test_api_->LockScreenTimerIsRunning());
-  EXPECT_FALSE(GetLockedState());
-}
-
 // Tests that shutdown animation is not started if the power button is released
 // quickly.
 TEST_F(TabletPowerButtonControllerTest,
        ReleasePowerButtonBeforeStartingShutdownAnimation) {
   PressPowerButton();
   EXPECT_TRUE(test_api_->ShutdownTimerIsRunning());
   EXPECT_FALSE(GetBacklightsForcedOff());
   ReleasePowerButton();
   power_manager_client_->SendBrightnessChanged(0, false);
   EXPECT_FALSE(test_api_->ShutdownTimerIsRunning());
@@ skipping 263 matching lines @@
   tablet_controller_->OnMaximizeModeEnded();
   EXPECT_FALSE(lock_state_test_api_->shutdown_timer_is_running());
   tick_clock_->Advance(base::TimeDelta::FromMilliseconds(4500));
   power_manager_client_->SendPowerButtonEvent(false, tick_clock_->NowTicks());
   EXPECT_FALSE(GetLockedState());
   EXPECT_FALSE(GetBacklightsForcedOff());
 }
 
 }  // namespace test
 }  // namespace ash