Part 1: Plumb render view ID to render host

content/renderer/media/audio_renderer_mixer_manager_unittest.cc

 // 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.
 
 #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"
 #include "media/base/fake_audio_render_callback.h"
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 static const int kBitsPerChannel = 16;
 static const int kSampleRate = 48000;
 static const int kBufferSize = 8192;
 static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO;
+static const int kRenderViewId = -2;
 
 // By sub-classing AudioDeviceFactory we've overridden the factory to use our
 // CreateAudioDevice() method globally.
 class MockAudioRenderSinkFactory : public AudioDeviceFactory {
  public:
   MockAudioRenderSinkFactory() {}
   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 {
     ADD_FAILURE();
     return NULL;
   }
 
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderSinkFactory);
 };
 
 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));
   }
 
   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);
   }
 
   // Number of instantiated mixers.
   int mixer_count() {
     return manager_->mixers_.size();
   }
@@ skipping 46 matching lines @@
 
 // Verify CreateInput() provides AudioRendererMixerInput with the appropriate
 // callbacks and they are working as expected.
 TEST_F(AudioRendererMixerManagerTest, CreateInput) {
   media::AudioParameters params(
       media::AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, kSampleRate,
       kBitsPerChannel, kBufferSize);
 
   // 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
   // callbacks needed to acquire an AudioRendererMixer and remove it.
   media::FakeAudioRenderCallback callback(0);
   input->Initialize(params, &callback);
   EXPECT_EQ(mixer_count(), 1);
 
   // Destroying the input should destroy the mixer.
   input = NULL;
   EXPECT_EQ(mixer_count(), 0);
 }
 
 }  // namespace content