Revert 238325 "Attempt to fix audio wedges by restarting all str..."

trunk/src/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 41 matching lines @@
   }
 
   close_timer_.Reset();
   return true;
 }
 
 bool AudioOutputDispatcherImpl::StartStream(
     AudioOutputStream::AudioSourceCallback* callback,
     AudioOutputProxy* stream_proxy) {
   DCHECK(message_loop_->BelongsToCurrentThread());
-  DCHECK(proxy_to_physical_map_.find(stream_proxy) ==
-         proxy_to_physical_map_.end());
 
   if (idle_streams_.empty() && !CreateAndOpenStream())
     return false;
 
   AudioOutputStream* physical_stream = idle_streams_.back();
   DCHECK(physical_stream);
   idle_streams_.pop_back();
 
   DCHECK_GT(paused_proxies_, 0u);
   --paused_proxies_;
@@ skipping 107 matching lines @@
 
 // This method is called by |close_timer_|.
 void AudioOutputDispatcherImpl::ClosePendingStreams() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   while (!idle_streams_.empty()) {
     idle_streams_.back()->Close();
     idle_streams_.pop_back();
   }
 }
 
-void AudioOutputDispatcherImpl::CloseStreamsForWedgeFix() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
-  while (!pausing_streams_.empty()) {
-    idle_streams_.push_back(pausing_streams_.back());
-    pausing_streams_.pop_back();
-  }
-  ClosePendingStreams();
-}
-
-void AudioOutputDispatcherImpl::RestartStreamsForWedgeFix() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
-
-  // Should only be called when the dispatcher is used with fake streams which
-  // don't need to be shutdown or restarted.
-  CHECK_EQ(params_.format(), AudioParameters::AUDIO_FAKE);
-}
-
 }  // namespace media