Plumb render view ID from audio-related code in renderer through IPCs to AudioRendererHost in brows…

media/audio/audio_output_device_unittest.cc

Index: media/audio/audio_output_device_unittest.cc
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index e1538da31b1e421743848f83e8f334744a24f039..c8273dc9642bee4cca1223a10472ff22b645ece6 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -100,8 +100,6 @@ class AudioOutputDeviceTest
       : default_audio_parameters_(AudioParameters::AUDIO_PCM_LINEAR,
                                   CHANNEL_LAYOUT_STEREO,
                                   48000, 16, 1024),
-        audio_device_(new AudioOutputDevice(
-            &audio_output_ipc_, io_loop_.message_loop_proxy())),
         synchronized_io_(GetParam()),
         input_channels_(synchronized_io_ ? 2 : 0) {
   }
@@ -122,7 +120,7 @@ class AudioOutputDeviceTest
   MessageLoopForIO io_loop_;
   const AudioParameters default_audio_parameters_;
   StrictMock<MockRenderCallback> callback_;
-  StrictMock<MockAudioOutputIPC> audio_output_ipc_;
+  StrictMock<MockAudioOutputIPC>* audio_output_ipc_;  // Owned by audio_device_.
   scoped_refptr<AudioOutputDevice> audio_device_;
 
  private:
@@ -158,6 +156,11 @@ int AudioOutputDeviceTest::CalculateMemorySize() {
 }
 
 void AudioOutputDeviceTest::Initialize() {
+  audio_output_ipc_ = new StrictMock<MockAudioOutputIPC>;
+  audio_device_ = new AudioOutputDevice(
+      scoped_ptr<AudioOutputIPC>(audio_output_ipc_),
+      io_loop_.message_loop_proxy());
+
   if (synchronized_io_) {
     audio_device_->InitializeIO(default_audio_parameters_,
                                 input_channels_,
@@ -172,9 +175,9 @@ void AudioOutputDeviceTest::Initialize() {
 void AudioOutputDeviceTest::StartAudioDevice() {
   audio_device_->Start();
 
-  EXPECT_CALL(audio_output_ipc_, AddDelegate(audio_device_.get()))
+  EXPECT_CALL(*audio_output_ipc_, AddDelegate(audio_device_.get()))
       .WillOnce(Return(kStreamId));
-  EXPECT_CALL(audio_output_ipc_, CreateStream(kStreamId, _, _));
+  EXPECT_CALL(*audio_output_ipc_, CreateStream(kStreamId, _, _));
 
   io_loop_.RunAllPending();
 }
@@ -210,7 +213,7 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
   // shared memory section.
   const int kMemorySize = CalculateMemorySize();
 
-  EXPECT_CALL(audio_output_ipc_, PlayStream(kStreamId))
+  EXPECT_CALL(*audio_output_ipc_, PlayStream(kStreamId))
       .WillOnce(SendPendingBytes(&browser_socket_, kMemorySize));
 
   // We expect calls to our audio renderer callback, which returns the number
@@ -244,8 +247,8 @@ void AudioOutputDeviceTest::WaitUntilRenderCallback() {
 void AudioOutputDeviceTest::StopAudioDevice() {
   audio_device_->Stop();
 
-  EXPECT_CALL(audio_output_ipc_, CloseStream(kStreamId));
-  EXPECT_CALL(audio_output_ipc_, RemoveDelegate(kStreamId));
+  EXPECT_CALL(*audio_output_ipc_, CloseStream(kStreamId));
+  EXPECT_CALL(*audio_output_ipc_, RemoveDelegate(kStreamId));
 
   io_loop_.RunAllPending();
 }
@@ -282,8 +285,8 @@ TEST_P(AudioOutputDeviceTest, StopBeforeRender) {
 
   // Expect us to shutdown IPC but not to render anything despite the stream
   // getting created.
-  EXPECT_CALL(audio_output_ipc_, CloseStream(kStreamId));
-  EXPECT_CALL(audio_output_ipc_, RemoveDelegate(kStreamId));
+  EXPECT_CALL(*audio_output_ipc_, CloseStream(kStreamId));
+  EXPECT_CALL(*audio_output_ipc_, RemoveDelegate(kStreamId));
   CreateStream();
 }