Adds more logging for audio input issues.

media/audio/audio_input_controller.cc

 // Copyright (c) 2012 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 "media/audio/audio_input_controller.h"
 
 #include "base/bind.h"
 #include "base/threading/thread_restrictions.h"
 #include "media/base/limits.h"
 #include "media/base/scoped_histogram_timer.h"
@@ skipping 184 matching lines @@
 
   if (stream_ && !stream_->Open()) {
     stream_->Close();
     stream_ = NULL;
     handler_->OnError(this, STREAM_OPEN_ERROR);
     return;
   }
 
   DCHECK(!no_data_timer_.get());
 
-  // This is a fix for crbug.com/357501.  The timer can trigger when closing
-  // the lid on Macs, which causes more problems than the timer fixes.
-  // Also, in crbug.com/357569, the goal is to remove usage of this timer
-  // since it was added to solve a crash on Windows that no longer can be
-  // reproduced.
+  // The timer is enabled for logging purposes. The NO_DATA_ERROR triggered
+  // from the timer must be ignored by the EventHandler.
   // TODO(henrika): remove usage of timer when it has been verified on Canary
   // that we are safe doing so. Goal is to get rid of |no_data_timer_| and
-  // everything that is tied to it.
-  enable_nodata_timer = false;
+  // everything that is tied to it. crbug.com/357569.
+  enable_nodata_timer = true;
 
   if (enable_nodata_timer) {
     // Create the data timer which will call DoCheckForNoData(). The timer
     // is started in DoRecord() and restarted in each DoCheckForNoData()
     // callback.
     no_data_timer_.reset(new base::Timer(
         FROM_HERE, base::TimeDelta::FromSeconds(kTimerInitialIntervalSeconds),
         base::Bind(&AudioInputController::DoCheckForNoData,
                    base::Unretained(this)), false));
   } else {
@@ skipping 93 matching lines @@
 }
 
 void AudioInputController::DoCheckForNoData() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!GetDataIsActive()) {
     // The data-is-active marker will be false only if it has been more than
     // one second since a data packet was recorded. This can happen if a
     // capture device has been removed or disabled.
     handler_->OnError(this, NO_DATA_ERROR);
-    return;
   }
 
   // Mark data as non-active. The flag will be re-enabled in OnData() each
   // time a data packet is received. Hence, under normal conditions, the
   // flag will only be disabled during a very short period.
   SetDataIsActive(false);
 
   // Restart the timer to ensure that we check the flag again in
   // |kTimerResetIntervalSeconds|.
   no_data_timer_->Start(
@@ skipping 59 matching lines @@
 
 void AudioInputController::SetDataIsActive(bool enabled) {
   base::subtle::Release_Store(&data_is_active_, enabled);
 }
 
 bool AudioInputController::GetDataIsActive() {
   return (base::subtle::Acquire_Load(&data_is_active_) != false);
 }
 
 }  // namespace media