Index: content/renderer/media/audio_renderer_mixer_manager_unittest.cc |
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc |
index 40b642e44b0e981cc60a915ca1a7721c81230608..4560045bce305a1d2f57f01286b1524879df0ab6 100644 |
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc |
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc |
@@ -18,6 +18,7 @@ static const int kBitsPerChannel = 16; |
static const int kSampleRate = 48000; |
static const int kBufferSize = 8192; |
static const media::ChannelLayout kChannelLayout = media::CHANNEL_LAYOUT_STEREO; |
+static const int kRenderViewId = -2; |
// By sub-classing AudioDeviceFactory we've overridden the factory to use our |
// CreateAudioDevice() method globally. |
@@ -27,14 +28,16 @@ class MockAudioRenderSinkFactory : public AudioDeviceFactory { |
virtual ~MockAudioRenderSinkFactory() {} |
protected: |
- virtual media::MockAudioRendererSink* CreateOutputDevice() OVERRIDE { |
+ virtual media::MockAudioRendererSink* CreateOutputDevice(int render_view_id) |
+ OVERRIDE { |
media::MockAudioRendererSink* sink = new media::MockAudioRendererSink(); |
EXPECT_CALL(*sink, Start()); |
EXPECT_CALL(*sink, Stop()); |
return sink; |
} |
- virtual media::AudioInputDevice* CreateInputDevice() OVERRIDE { |
+ virtual media::AudioInputDevice* CreateInputDevice(int render_view_id) |
+ OVERRIDE { |
ADD_FAILURE(); |
return NULL; |
} |
@@ -52,16 +55,22 @@ class AudioRendererMixerManagerTest : public testing::Test { |
} |
media::AudioRendererMixer* GetMixer(const media::AudioParameters& params) { |
- return manager_->GetMixer(params); |
+ return manager_->GetMixer(kRenderViewId, params); |
} |
void RemoveMixer(const media::AudioParameters& params) { |
- return manager_->RemoveMixer(params); |
+ return manager_->RemoveMixer(kRenderViewId, params); |
} |
// Number of instantiated mixers. |
int mixer_count() { |
- return manager_->mixers_.size(); |
+ int count = 0; |
+ typedef AudioRendererMixerManager::AudioRendererMixerMap MixerMap; |
+ for (MixerMap::const_iterator it = manager_->mixers_.begin(); |
+ it != manager_->mixers_.end(); ++it) { |
+ count += it->second.size(); |
+ } |
+ return count; |
} |
protected: |
@@ -119,7 +128,8 @@ TEST_F(AudioRendererMixerManagerTest, CreateInput) { |
// Create a mixer input and ensure it doesn't instantiate a mixer yet. |
EXPECT_EQ(mixer_count(), 0); |
- scoped_refptr<media::AudioRendererMixerInput> input(manager_->CreateInput()); |
+ scoped_refptr<media::AudioRendererMixerInput> input( |
+ manager_->CreateInput(kRenderViewId)); |
EXPECT_EQ(mixer_count(), 0); |
// Implicitly test that AudioRendererMixerInput was provided with the expected |