Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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 fe601d8a9e0474faff77feee0becc06234b3dd38..a59eb82db44976e749420fa09f8ad6204692fed4 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -49,15 +49,12 @@ class MockAudioOutputIPC : public AudioOutputIPC {
   MockAudioOutputIPC() {}
   virtual ~MockAudioOutputIPC() {}
 
-  MOCK_METHOD1(AddDelegate, int(AudioOutputIPCDelegate* delegate));
-  MOCK_METHOD1(RemoveDelegate, void(int stream_id));
-
-  MOCK_METHOD2(CreateStream,
-      void(int stream_id, const AudioParameters& params));
-  MOCK_METHOD1(PlayStream, void(int stream_id));
-  MOCK_METHOD1(CloseStream, void(int stream_id));
-  MOCK_METHOD2(SetVolume, void(int stream_id, double volume));
-  MOCK_METHOD1(PauseStream, void(int stream_id));
+  MOCK_METHOD2(CreateStream, void(AudioOutputIPCDelegate* delegate,
+                                  const AudioParameters& params));
+  MOCK_METHOD0(PlayStream, void());
+  MOCK_METHOD0(PauseStream, void());
+  MOCK_METHOD0(CloseStream, void());
+  MOCK_METHOD1(SetVolume, void(double volume));
 };
 
 // Creates a copy of a SyncSocket handle that we can give to AudioOutputDevice.
@@ -111,7 +108,7 @@ class AudioOutputDeviceTest
   MessageLoopForIO io_loop_;
   AudioParameters default_audio_parameters_;
   StrictMock<MockRenderCallback> callback_;
-  StrictMock<MockAudioOutputIPC> audio_output_ipc_;
+  MockAudioOutputIPC* audio_output_ipc_;  // owned by audio_device_
   scoped_refptr<AudioOutputDevice> audio_device_;
 
  private:
@@ -154,8 +151,10 @@ AudioOutputDeviceTest::AudioOutputDeviceTest()
       CHANNEL_LAYOUT_STEREO, 2, input_channels_,
       48000, 16, 1024);
 
+  audio_output_ipc_ = new MockAudioOutputIPC();
   audio_device_ = new AudioOutputDevice(
-      &audio_output_ipc_, io_loop_.message_loop_proxy());
+      scoped_ptr<AudioOutputIPC>(audio_output_ipc_),
+      io_loop_.message_loop_proxy());
 
   audio_device_->Initialize(default_audio_parameters_,
                             &callback_);
@@ -170,8 +169,7 @@ AudioOutputDeviceTest::~AudioOutputDeviceTest() {
 void AudioOutputDeviceTest::StartAudioDevice() {
   audio_device_->Start();
 
-  EXPECT_CALL(audio_output_ipc_, AddDelegate(_)).WillOnce(Return(kStreamId));
-  EXPECT_CALL(audio_output_ipc_, CreateStream(kStreamId, _));
+  EXPECT_CALL(*audio_output_ipc_, CreateStream(audio_device_.get(), _));
 
   io_loop_.RunUntilIdle();
 }
@@ -207,7 +205,7 @@ void AudioOutputDeviceTest::ExpectRenderCallback() {
   // shared memory section.
   const int kMemorySize = CalculateMemorySize();
 
-  EXPECT_CALL(audio_output_ipc_, PlayStream(kStreamId))
+  EXPECT_CALL(*audio_output_ipc_, PlayStream())
       .WillOnce(SendPendingBytes(&browser_socket_, kMemorySize));
 
   // We expect calls to our audio renderer callback, which returns the number
@@ -241,8 +239,7 @@ 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());
 
   io_loop_.RunUntilIdle();
 }
@@ -277,8 +274,7 @@ 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());
   CreateStream();
 }