Refactor ShouldLockScreenBeforeSuspending to ShouldLockScreenAutomatically

ash/system/chromeos/power/power_event_observer.cc

 // 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.
 
 #include "ash/system/chromeos/power/power_event_observer.h"
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 62 matching lines @@
 void PowerEventObserver::BrightnessChanged(int level, bool user_initiated) {
   Shell::GetInstance()->power_button_controller()->OnScreenBrightnessChanged(
       static_cast<double>(level));
 }
 
 void PowerEventObserver::SuspendImminent() {
   SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
 
   // This class is responsible for disabling all rendering requests at suspend
   // time and then enabling them at resume time.  When the
-  // lock-before-suspending pref is not set this is easy to do since
+  // auto-screen-lock pref is not set this is easy to do since
   // StopRenderingRequests() is just called directly from this function.  If the
-  // lock-before-suspending pref _is_ set, then the suspend needs to be delayed
+  // auto-screen-lock pref _is_ set, then the suspend needs to be delayed
   // until the lock screen is fully visible.  While it is sufficient from a
   // security perspective to block only until the lock screen is ready, which
   // guarantees that the contents of the user's screen are no longer visible,
   // this leads to poor UX on the first resume since neither the user pod nor
   // the header bar will be visible for a few hundred milliseconds until the GPU
   // process starts rendering again.  To deal with this, the suspend is delayed
   // until all the lock screen animations have completed and the suspend request
   // is unblocked from OnLockAnimationsComplete().
-  if (!screen_locked_ && delegate->ShouldLockScreenBeforeSuspending() &&
+  if (!screen_locked_ && delegate->ShouldLockScreenAutomatically() &&
       delegate->CanLockScreen()) {
     screen_lock_callback_ = chromeos::DBusThreadManager::Get()
                                 ->GetPowerManagerClient()
                                 ->GetSuspendReadinessCallback();
     VLOG(1) << "Requesting screen lock from PowerEventObserver";
     chromeos::DBusThreadManager::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
   } else if (waiting_for_lock_screen_animations_) {
     // The lock-before-suspending pref has been set and the lock screen is ready
@@ skipping 43 matching lines @@
   } else {
     VLOG(1) << "Screen locked without suspend";
   }
 }
 
 void PowerEventObserver::ScreenIsUnlocked() {
   screen_locked_ = false;
 }
 
 }  // namespace ash