Merge 233843 "Ensure the wedge timer isn't started until after S..."

media/audio/audio_output_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_output_controller.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 180 matching lines @@
 #if defined(AUDIO_POWER_MONITORING)
   power_monitor_.Reset();
   power_poll_callback_.Reset(
       base::Bind(&AudioOutputController::ReportPowerMeasurementPeriodically,
                  this));
   // Run the callback to send an initial notification that we're starting in
   // silence, and to schedule periodic callbacks.
   power_poll_callback_.callback().Run();
 #endif
 
+  on_more_io_data_called_ = 0;
+  AllowEntryToOnMoreIOData();
+  stream_->Start(this);
+
   // For UMA tracking purposes, start the wedge detection timer.  This allows us
   // to record statistics about the number of wedged playbacks in the field.
   //
   // WedgeCheck() will look to see if |on_more_io_data_called_| is true after
   // the timeout expires.  Care must be taken to ensure the wedge check delay is
   // large enough that the value isn't queried while OnMoreDataIO() is setting
   // it.
   //
   // Timer self-manages its lifetime and WedgeCheck() will only record the UMA
   // statistic if state is still kPlaying.  Additional Start() calls will
   // invalidate the previous timer.
   wedge_timer_.reset(new base::OneShotTimer<AudioOutputController>());
   wedge_timer_->Start(
-      FROM_HERE, TimeDelta::FromSeconds(3), this,
+      FROM_HERE, TimeDelta::FromSeconds(5), this,
       &AudioOutputController::WedgeCheck);
-  on_more_io_data_called_ = 0;
-
-  AllowEntryToOnMoreIOData();
-  stream_->Start(this);
 
   handler_->OnPlaying();
 }
 
 #if defined(AUDIO_POWER_MONITORING)
 void AudioOutputController::ReportPowerMeasurementPeriodically() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   const std::pair<float, bool>& reading =
       power_monitor_.ReadCurrentPowerAndClip();
   handler_->OnPowerMeasured(reading.first, reading.second);
@@ skipping 254 matching lines @@
     UMA_HISTOGRAM_BOOLEAN(
         "Media.AudioOutputControllerPlaybackStartupSuccess", playback_success);
 
     // Let the AudioManager try and fix it.
     if (!playback_success)
       audio_manager_->FixWedgedAudio();
   }
 }
 
 }  // namespace media