Don't fallback if we've successfully opened a stream previously.

media/audio/audio_output_dispatcher_impl.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_dispatcher_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 26 matching lines @@
   DCHECK(idle_streams_.empty());
   DCHECK(pausing_streams_.empty());
 }
 
 bool AudioOutputDispatcherImpl::OpenStream() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   paused_proxies_++;
 
   // Ensure that there is at least one open stream.
-  if (idle_streams_.empty() && !CreateAndOpenStream())
+  if (idle_streams_.empty() && !CreateAndOpenStream()) {
+    paused_proxies_--;

[tommi (sloooow) - chröme, 2012/09/21 08:46:27]

I'm curious - why not move the ++ below the if instead?

[DaleCurtis, 2012/09/21 17:07:59]

That would have made too much sense for this class. :) I'll tag it for cleanup.

     return false;
+  }
 
   close_timer_.Reset();
   return true;
 }
 
 bool AudioOutputDispatcherImpl::StartStream(
     AudioOutputStream::AudioSourceCallback* callback,
     AudioOutputProxy* stream_proxy) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
@@ skipping 18 matching lines @@
   physical_stream->SetVolume(volume);
   physical_stream->Start(callback);
   proxy_to_physical_map_[stream_proxy] = physical_stream;
   return true;
 }
 
 void AudioOutputDispatcherImpl::StopStream(AudioOutputProxy* stream_proxy) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy);
-  // StopStream() may have already been called.
-  // TODO(dalecurtis): StopStream() shouldn't be called twice!  See:
-  // http://crbug.com/149815 and http://crbug.com/150619
-  if (it == proxy_to_physical_map_.end())
-    return;
+  DCHECK(it != proxy_to_physical_map_.end());
   AudioOutputStream* physical_stream = it->second;
   proxy_to_physical_map_.erase(it);
 
   physical_stream->Stop();
 
   ++paused_proxies_;
 
   pausing_streams_.push_front(physical_stream);
 
   // Don't recycle stream until two buffers worth of time has elapsed.
@@ skipping 93 matching lines @@
 // This method is called by |close_timer_|.
 void AudioOutputDispatcherImpl::ClosePendingStreams() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   while (!idle_streams_.empty()) {
     idle_streams_.back()->Close();
     idle_streams_.pop_back();
   }
 }
 
 }  // namespace media