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

media/audio/audio_manager_base.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_MANAGER_BASE_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 101 matching lines @@
   virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE;
   virtual AudioParameters GetOutputStreamParameters(
       const std::string& device_id) OVERRIDE;
 
   virtual AudioParameters GetInputStreamParameters(
       const std::string& device_id) OVERRIDE;
 
   virtual std::string GetAssociatedOutputDeviceID(
       const std::string& input_device_id) OVERRIDE;
 
+  virtual void FixWedgedAudio() OVERRIDE;
+
  protected:
   AudioManagerBase();
 
   // Shuts down the audio thread and releases all the audio output dispatchers
   // on the audio thread.  All audio streams should be freed before Shutdown()
   // is called.  This must be called in the destructor of every AudioManagerBase
   // implementation.
   void Shutdown();
 
   void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
@@ skipping 63 matching lines @@
   // Map of cached AudioOutputDispatcher instances.  Must only be touched
   // from the audio thread (no locking).
   AudioOutputDispatchers output_dispatchers_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_