Associate audio streams with their source/destination RenderView.

content/renderer/media/audio_renderer_mixer_manager_unittest.cc

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..a1f07eccf793fdf9dc704fa1a84fdceefff78148 100644
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
-#include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
@@ -19,36 +18,30 @@ static const int kSampleRate = 48000;
 static const int kBufferSize = 8192;
 static const media::ChannelLayout kChannelLayout = media::CHANNEL_LAYOUT_STEREO;
 
-// By sub-classing AudioDeviceFactory we've overridden the factory to use our
-// CreateAudioDevice() method globally.
-class MockAudioRenderSinkFactory : public AudioDeviceFactory {
+// Subclass AudioRendererMixerManager to inject a mock AudioRendererSink.
+class TestAudioRendererMixerManager : public AudioRendererMixerManager {
  public:
-  MockAudioRenderSinkFactory() {}
-  virtual ~MockAudioRenderSinkFactory() {}
+  TestAudioRendererMixerManager()
+      : AudioRendererMixerManager(kSampleRate, kBufferSize) {}
+  virtual ~TestAudioRendererMixerManager() {}
 
- protected:
-  virtual media::MockAudioRendererSink* CreateOutputDevice() OVERRIDE {
+  virtual media::AudioRendererSink* CreateAudioRendererSink() OVERRIDE {
+    // We don't want to deal with instantiating a real AudioOutputDevice since
+    // it's not important to our testing, so use a mock AudioDeviceFactory.
     media::MockAudioRendererSink* sink = new media::MockAudioRendererSink();
     EXPECT_CALL(*sink, Start());
     EXPECT_CALL(*sink, Stop());
     return sink;
   }
 
-  virtual media::AudioInputDevice* CreateInputDevice() OVERRIDE {
-    ADD_FAILURE();
-    return NULL;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(MockAudioRenderSinkFactory);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestAudioRendererMixerManager);
 };
 
 class AudioRendererMixerManagerTest : public testing::Test {
  public:
   AudioRendererMixerManagerTest() {
-    // We don't want to deal with instantiating a real AudioOutputDevice since
-    // it's not important to our testing, so use a mock AudioDeviceFactory.
-    mock_sink_factory_.reset(new MockAudioRenderSinkFactory());
-    manager_.reset(new AudioRendererMixerManager(kSampleRate, kBufferSize));
+    manager_.reset(new TestAudioRendererMixerManager());
   }
 
   media::AudioRendererMixer* GetMixer(const media::AudioParameters& params) {
@@ -65,7 +58,6 @@ class AudioRendererMixerManagerTest : public testing::Test {
   }
 
  protected:
-  scoped_ptr<MockAudioRenderSinkFactory> mock_sink_factory_;
   scoped_ptr<AudioRendererMixerManager> manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManagerTest);