Revert of Tablet-like power button behavior on Convertible/Tablet ChromeOS devices

ash/wm/lock_state_controller.h

 // Copyright 2013 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.
 
 #ifndef ASH_WM_LOCK_STATE_CONTROLLER_H_
 #define ASH_WM_LOCK_STATE_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 21 matching lines @@
 
 namespace ash {
 
 namespace mojom {
 class ShutdownClient;
 }
 
 namespace test {
 class LockStateControllerTest;
 class LockStateControllerTestApi;
+class PowerButtonControllerTest;
 }
 
 // Displays onscreen animations and locks or suspends the system in response to
 // the power button being pressed or released.
 // Lock workflow:
 // Entry points:
 //  * StartLockAnimation (bool shutdown after lock) - starts lock that can be
 //    cancelled.
 //  * StartLockAnimationAndLockImmediately (bool shutdown after lock) - starts
 //    uninterruptible lock animation.
@@ skipping 94 matching lines @@
   // ShellObserver overrides:
   void OnLoginStateChanged(LoginStatus status) override;
   void OnAppTerminating() override;
   void OnLockStateChanged(bool locked) override;
 
   void set_animator_for_test(SessionStateAnimator* animator) {
     animator_.reset(animator);
   }
 
  private:
+  friend class test::PowerButtonControllerTest;
   friend class test::LockStateControllerTest;
   friend class test::LockStateControllerTestApi;
 
   struct UnlockedStateProperties {
     bool wallpaper_is_hidden;
   };
 
   // Reverts the pre-lock animation, reports the error.
   void OnLockFailTimeout();
 
@@ skipping 103 matching lines @@
   base::Closure lock_screen_displayed_callback_;
 
   base::WeakPtrFactory<LockStateController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LockStateController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_LOCK_STATE_CONTROLLER_H_