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

media/audio/audio_output_resampler.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.
 
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 35 matching lines @@
 
   // AudioOutputDispatcher interface.
   virtual bool OpenStream() OVERRIDE;
   virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
                            AudioOutputProxy* stream_proxy) OVERRIDE;
   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:
   friend class base::RefCountedThreadSafe<AudioOutputResampler>;
   virtual ~AudioOutputResampler();
 
   // Used to initialize and reinitialize |dispatcher_|.
   void Initialize();
 
   // Dispatcher to proxy all AudioOutputDispatcher calls too.
   scoped_refptr<AudioOutputDispatcher> dispatcher_;
@@ skipping 12 matching lines @@
   // Whether any streams have been opened through |dispatcher_|, if so we can't
   // fallback on future OpenStream() failures.
   bool streams_opened_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputResampler);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_