Remove logging added for debugging the lockscreen crashes.

ash/wm/lock_state_controller.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/wm/lock_state_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 71 matching lines @@
 }
 
 LockStateController::LockStateController()
     : animator_(new SessionStateAnimatorImpl()),
       login_status_(LoginStatus::NOT_LOGGED_IN),
       system_is_locked_(false),
       shutting_down_(false),
       shutdown_after_lock_(false),
       animating_lock_(false),
       can_cancel_lock_animation_(false),
-      lock_fail_timer_is_stopped_(true),
       weak_ptr_factory_(this) {
   Shell::GetPrimaryRootWindow()->GetHost()->AddObserver(this);
 }
 
 LockStateController::~LockStateController() {
   Shell::GetPrimaryRootWindow()->GetHost()->RemoveObserver(this);
 }
 
 void LockStateController::SetDelegate(
     std::unique_ptr<LockStateControllerDelegate> delegate) {
@@ skipping 28 matching lines @@
 
 void LockStateController::StartLockAnimationAndLockImmediately(
     bool shutdown_after_lock) {
   if (animating_lock_)
     return;
   shutdown_after_lock_ = shutdown_after_lock;
   StartImmediatePreLockAnimation(true /* request_lock_on_completion */);
 }
 
 bool LockStateController::LockRequested() {
-  // TODO(jdufault): Remove DCHECK after resolving crbug.com/452599; this is not
-  // expected to trigger. The DCHECK is only present to assert all assumptions.
-  DCHECK(lock_fail_timer_is_stopped_ != lock_fail_timer_.IsRunning());
   return lock_fail_timer_.IsRunning();
 }
 
 bool LockStateController::ShutdownRequested() {
   return shutting_down_;
 }
 
 bool LockStateController::CanCancelLockAnimation() {
   return can_cancel_lock_animation_;
 }
@@ skipping 65 matching lines @@
     const base::Closure& callback) {
   lock_screen_displayed_callback_ = callback;
 }
 
 void LockStateController::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   Shell::GetInstance()->delegate()->Exit();
 }
 
 void LockStateController::OnLoginStateChanged(LoginStatus status) {
-  // TODO(jdufault): Remove after resolving crbug.com/452599.
-  VLOG(0) << "LockStateController::OnLoginStateChanged login_status_: "
-          << static_cast<int>(login_status_)
-          << ", status: " << static_cast<int>(status);
   if (status != LoginStatus::LOCKED)
     login_status_ = status;
   system_is_locked_ = (status == LoginStatus::LOCKED);
 }
 
 void LockStateController::OnAppTerminating() {
   // If we hear that Chrome is exiting but didn't request it ourselves, all we
   // can really hope for is that we'll have time to clear the screen.
   // This is also the case when the user signs off.
   if (!shutting_down_) {
     shutting_down_ = true;
     Shell* shell = ash::Shell::GetInstance();
     shell->cursor_manager()->HideCursor();
     shell->cursor_manager()->LockCursor();
     animator_->StartAnimation(SessionStateAnimator::kAllNonRootContainersMask,
                               SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
                               SessionStateAnimator::ANIMATION_SPEED_IMMEDIATE);
   }
 }
 
 void LockStateController::OnLockStateChanged(bool locked) {
   DCHECK((lock_fail_timer_.IsRunning() && lock_duration_timer_ != nullptr) ||
          (!lock_fail_timer_.IsRunning() && lock_duration_timer_ == nullptr));
   VLOG(1) << "OnLockStateChanged called with locked: " << locked
           << ", shutting_down_: " << shutting_down_
           << ", system_is_locked_: " << system_is_locked_
-          << ", lock_fail_timer_.IsRunning(): " << lock_fail_timer_.IsRunning()
-          << ", lock_fail_timer_is_stopped_: " << lock_fail_timer_is_stopped_;
+          << ", lock_fail_timer_.IsRunning(): " << lock_fail_timer_.IsRunning();
 
   if (shutting_down_ || (system_is_locked_ == locked))
     return;
 
   system_is_locked_ = locked;
 
   if (locked) {
     StartPostLockAnimation();
 
-    // TODO(jdufault): Remove after resolving crbug.com/452599.
-    VLOG(0) << "Stopping lock_fail_timer_";
     lock_fail_timer_.Stop();
-    lock_fail_timer_is_stopped_ = true;
 
     if (lock_duration_timer_) {
       UMA_HISTOGRAM_LOCK_TIMES("Ash.WindowManager.Lock.Success",
                                lock_duration_timer_->Elapsed());
       lock_duration_timer_.reset();
     }
   } else {
     StartUnlockAnimationAfterUIDestroyed();
   }
 }
 
 void LockStateController::OnLockFailTimeout() {
   UMA_HISTOGRAM_LOCK_TIMES("Ash.WindowManager.Lock.Timeout",
                            lock_duration_timer_->Elapsed());
   lock_duration_timer_.reset();
   DCHECK(!system_is_locked_);
 
-  std::string loading_webpage = "unknown";
-  if (delegate_)
-    loading_webpage = delegate_->IsLoading() ? "true" : "false";
-
   LOG(FATAL) << "Screen lock took too long; crashing intentionally "
-             << "(loading webpage: " << loading_webpage
-             << ", lock_fail_timer.IsRunning: " << lock_fail_timer_.IsRunning()
-             << ", lock_fail_timer_is_stopped_: " << lock_fail_timer_is_stopped_
+             << "(lock_fail_timer_.IsRunning: " << lock_fail_timer_.IsRunning()

[Daniel Erat, 2016/06/16 19:54:08]

i don't understand the value of logging lock_fail_timer_'s state here.
OnLockFailTimeout() is only called by lock_fail_timer_, and it's a
base::OneShotTimer(). is it even possible for it to be running while in this
method? it doesn't seem like it.

[jdufault, 2016/06/20 16:36:01]

Done.

              << ")";
 }
 
 void LockStateController::StartLockToShutdownTimer() {
   shutdown_after_lock_ = false;
   lock_to_shutdown_timer_.Stop();
   lock_to_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(kLockToShutdownTimeoutMs),
       this, &LockStateController::OnLockToShutdownTimeout);
@@ skipping 241 matching lines @@
 #if defined(OS_CHROMEOS)
   // Increase lock timeout for slower hardware, see http://crbug.com/350628
   const std::string board = base::SysInfo::GetLsbReleaseBoard();
   if (board == "x86-mario" ||
       base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) ||
       base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) ||
       base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) {
     timeout *= 2;
   }
 #endif
-  // TODO(jdufault): Remove after resolving crbug.com/452599.
-  VLOG(0) << "Starting LockFailTimer with a timeout of " << timeout << "s";
   lock_fail_timer_.Start(
       FROM_HERE, timeout, this, &LockStateController::OnLockFailTimeout);
-  lock_fail_timer_is_stopped_ = false;
 
   lock_duration_timer_.reset(new base::ElapsedTimer());
 }
 
 void LockStateController::PostLockAnimationFinished() {
   animating_lock_ = false;
   VLOG(1) << "PostLockAnimationFinished";
   FOR_EACH_OBSERVER(LockStateObserver, observers_,
       OnLockStateEvent(LockStateObserver::EVENT_LOCK_ANIMATION_FINISHED));
   if (!lock_screen_displayed_callback_.is_null()) {
@@ skipping 57 matching lines @@
   if (unlocked_properties_.get() &&
       unlocked_properties_->background_is_hidden) {
     animation_sequence->StartAnimation(
         SessionStateAnimator::DESKTOP_BACKGROUND,
         SessionStateAnimator::ANIMATION_FADE_OUT,
         speed);
   }
 }
 
 }  // namespace ash