Index: content/renderer/media/audio_renderer_mixer_manager.h |
diff --git a/content/renderer/media/audio_renderer_mixer_manager.h b/content/renderer/media/audio_renderer_mixer_manager.h |
index 8b13388de2599c7acbf4d968f1b80d5b8d97b60e..aa145add1c9f82c0b5b3027dfabbaee5ad9a8a59 100644 |
--- a/content/renderer/media/audio_renderer_mixer_manager.h |
+++ b/content/renderer/media/audio_renderer_mixer_manager.h |
@@ -13,7 +13,7 @@ |
#include "base/synchronization/lock.h" |
#include "content/common/content_export.h" |
#include "media/audio/audio_parameters.h" |
-#include "media/base/output_device.h" |
+#include "media/base/output_device_info.h" |
#include "url/origin.h" |
namespace media { |
@@ -122,20 +122,10 @@ class CONTENT_EXPORT AudioRendererMixerManager { |
// Overrides the AudioRendererSink implementation for unit testing. |
void SetAudioRendererSinkForTesting(media::AudioRendererSink* sink); |
Guido Urdaneta
2016/03/22 15:30:18
Remove this declaration as this method is now gone
o1ka
2016/03/22 16:13:55
Done.
|
- // A helper to get hardware output parameters in the absence of |
- // AudioOutputDevice. |
- static media::AudioParameters GetHardwareOutputParams( |
- int render_frame_id, |
- int session_id, |
- const std::string& device_id, |
- const url::Origin& security_origin); |
- |
// Active mixers. |
AudioRendererMixerMap mixers_; |
base::Lock mixers_lock_; |
- media::AudioRendererSink* sink_for_testing_; |
- |
DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager); |
}; |