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

media/audio/audio_output_controller.cc

Index: media/audio/audio_output_controller.cc
===================================================================
--- media/audio/audio_output_controller.cc	(revision 240690)
+++ media/audio/audio_output_controller.cc	(working copy)
@@ -198,6 +198,10 @@
   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.
   //
@@ -211,13 +215,9 @@
   // 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();
 }