Part 1: Plumb render view ID to render host

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 8133f341f17e9172e5640a8288a34f9e7b7c7cc9..166daef51e0a15dd05dd2df0be8f09fd53978cda 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -113,11 +113,6 @@ class AudioOutputDeviceTest : public testing::Test {
 
   ~AudioOutputDeviceTest() {}
 
-  AudioOutputDevice* CreateAudioDevice() {
-    return new AudioOutputDevice(
-        &audio_output_ipc_, io_loop_.message_loop_proxy());
-  }
-
   void set_stream_id(int stream_id) { stream_id_ = stream_id; }
 
  protected:
@@ -127,14 +122,15 @@ class AudioOutputDeviceTest : public testing::Test {
   MessageLoopForIO io_loop_;
   const AudioParameters default_audio_parameters_;
   MockRenderCallback callback_;
-  MockAudioOutputIPC audio_output_ipc_;
   int stream_id_;
 };
 
 // The simplest test for AudioOutputDevice.  Used to test construction of
 // AudioOutputDevice and that the runtime environment is set up correctly.
 TEST_F(AudioOutputDeviceTest, Initialize) {
-  scoped_refptr<AudioOutputDevice> audio_device(CreateAudioDevice());
+  MockAudioOutputIPC* audio_output_ipc = new MockAudioOutputIPC();
+  scoped_refptr<AudioOutputDevice> audio_device(
+      new AudioOutputDevice(audio_output_ipc, io_loop_.message_loop_proxy()));
   audio_device->Initialize(default_audio_parameters_, &callback_);
   io_loop_.RunAllPending();
 }
@@ -142,18 +138,20 @@ TEST_F(AudioOutputDeviceTest, Initialize) {
 // Calls Start() followed by an immediate Stop() and check for the basic message
 // filter messages being sent in that case.
 TEST_F(AudioOutputDeviceTest, StartStop) {
-  scoped_refptr<AudioOutputDevice> audio_device(CreateAudioDevice());
+  MockAudioOutputIPC* audio_output_ipc = new MockAudioOutputIPC();
+  scoped_refptr<AudioOutputDevice> audio_device(
+      new AudioOutputDevice(audio_output_ipc, io_loop_.message_loop_proxy()));
   audio_device->Initialize(default_audio_parameters_, &callback_);
 
-  EXPECT_CALL(audio_output_ipc_, AddDelegate(audio_device.get()))
+  EXPECT_CALL(*audio_output_ipc, AddDelegate(audio_device.get()))
       .WillOnce(Return(1));
-  EXPECT_CALL(audio_output_ipc_, RemoveDelegate(1)).WillOnce(Return());
+  EXPECT_CALL(*audio_output_ipc, RemoveDelegate(1)).WillOnce(Return());
 
   audio_device->Start();
   audio_device->Stop();
 
-  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _));
-  EXPECT_CALL(audio_output_ipc_, CloseStream(_));
+  EXPECT_CALL(*audio_output_ipc, CreateStream(_, _));
+  EXPECT_CALL(*audio_output_ipc, CloseStream(_));
 
   io_loop_.RunAllPending();
 }
@@ -162,16 +160,18 @@ TEST_F(AudioOutputDeviceTest, StartStop) {
 // that AudioOutputDevice must use for audio data.  It then sends a request for
 // a single audio packet and quits when the packet has been sent.
 TEST_F(AudioOutputDeviceTest, CreateStream) {
-  scoped_refptr<AudioOutputDevice> audio_device(CreateAudioDevice());
+  MockAudioOutputIPC* audio_output_ipc = new MockAudioOutputIPC();
+  scoped_refptr<AudioOutputDevice> audio_device(
+      new AudioOutputDevice(audio_output_ipc, io_loop_.message_loop_proxy()));
   audio_device->Initialize(default_audio_parameters_, &callback_);
 
-  EXPECT_CALL(audio_output_ipc_, AddDelegate(audio_device.get()))
+  EXPECT_CALL(*audio_output_ipc, AddDelegate(audio_device.get()))
       .WillOnce(Return(1));
-  EXPECT_CALL(audio_output_ipc_, RemoveDelegate(1)).WillOnce(Return());
+  EXPECT_CALL(*audio_output_ipc, RemoveDelegate(1)).WillOnce(Return());
 
   audio_device->Start();
 
-  EXPECT_CALL(audio_output_ipc_, CreateStream(_, _))
+  EXPECT_CALL(*audio_output_ipc, CreateStream(_, _))
       .WillOnce(WithArgs<0>(
           Invoke(this, &AudioOutputDeviceTest::set_stream_id)));
 
@@ -211,7 +211,7 @@ TEST_F(AudioOutputDeviceTest, CreateStream) {
   // Respond by asking for some audio data.  This should ask our callback
   // to provide some audio data that AudioOutputDevice then writes into the
   // shared memory section.
-  EXPECT_CALL(audio_output_ipc_, PlayStream(stream_id_))
+  EXPECT_CALL(*audio_output_ipc, PlayStream(stream_id_))
       .WillOnce(SendPendingBytes(&browser_socket, memory_size));
 
   // We expect calls to our audio renderer callback, which returns the number
@@ -248,7 +248,7 @@ TEST_F(AudioOutputDeviceTest, CreateStream) {
   io_loop_.Run();
 
   // Close the stream sequence.
-  EXPECT_CALL(audio_output_ipc_, CloseStream(stream_id_));
+  EXPECT_CALL(*audio_output_ipc, CloseStream(stream_id_));
 
   audio_device->Stop();
   io_loop_.RunAllPending();