Call close_timer_.Reset() from StopStreamTask.

media/audio/audio_output_dispatcher.cc

 // Copyright (c) 2011 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_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
@@ skipping 51 matching lines @@
 
   return stream;
 }
 
 void AudioOutputDispatcher::StreamStopped(AudioOutputStream* stream) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   paused_proxies_++;
 
   pausing_streams_.push_front(stream);
   close_timer_.Reset();

[Sergey Ulanov, 2011/11/23 18:07:57]

I think you should also remove this line, as it is pointless now.

[Reid Kleckner (google), 2011/11/23 18:40:44]

Done.

 
   // Don't recycle stream until two buffers worth of time has elapsed.
   message_loop_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&AudioOutputDispatcher::StopStreamTask, this),
       pause_delay_milliseconds_);
 }
 
 void AudioOutputDispatcher::StopStreamTask() {
   if (pausing_streams_.empty())
     return;
   AudioOutputStream* stream = pausing_streams_.back();
   pausing_streams_.pop_back();
   idle_streams_.push_back(stream);
+  close_timer_.Reset();
 }
 
 void AudioOutputDispatcher::StreamClosed() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   while (!pausing_streams_.empty()) {
     idle_streams_.push_back(pausing_streams_.back());
     pausing_streams_.pop_back();
   }
 
@@ skipping 35 matching lines @@
   close_timer_.Reset();
 }
 
 // This method is called by |close_timer_|.
 void AudioOutputDispatcher::ClosePendingStreams() {
   while (!idle_streams_.empty()) {
     idle_streams_.back()->Close();
     idle_streams_.pop_back();
   }
 }