Merge 238501 "Attempt to fix audio wedges by restarting all stre..."

media/audio/audio_output_dispatcher_impl.h

 // 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.
 
 // AudioOutputDispatcherImpl is an implementation of AudioOutputDispatcher.
 //
 // To avoid opening and closing audio devices more frequently than necessary,
 // each dispatcher has a pool of inactive physical streams. A stream is closed
 // only if it hasn't been used for a certain period of time (specified via the
 // constructor).
@@ skipping 41 matching lines @@
   // |stream| is  added to the pool of pending streams (i.e. |idle_streams_|).
   virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE;
 
   virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy,
                                double volume) OVERRIDE;
 
   virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE;
 
   virtual void Shutdown() OVERRIDE;
 
+  virtual void CloseStreamsForWedgeFix() OVERRIDE;
+  virtual void RestartStreamsForWedgeFix() OVERRIDE;
+
  private:
   typedef std::map<AudioOutputProxy*, AudioOutputStream*> AudioStreamMap;
   friend class base::RefCountedThreadSafe<AudioOutputDispatcherImpl>;
   virtual ~AudioOutputDispatcherImpl();
 
   friend class AudioOutputProxyTest;
 
   // Creates a new physical output stream, opens it and pushes to
   // |idle_streams_|.  Returns false if the stream couldn't be created or
   // opened.
@@ skipping 17 matching lines @@
   base::DelayTimer<AudioOutputDispatcherImpl> close_timer_;
 
   AudioStreamMap proxy_to_physical_map_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcherImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_IMPL_H_