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

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index eaaadcc4490c1fb18392d8c9b9bbfcf576838f5b..fa30c585acaa893352419c81d7c50dcedfdfdd7b 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -201,13 +201,19 @@ class AudioRendererHostTest : public testing::Test {
                 OnSetAudioStreamStatus(_, kStreamId, "created"));
 
     InSequence s;
-    // We will first receive an OnStreamCreated() signal.
+
+    // We will first receive an OnStreamCreated() signal and AudioRendererHost
+    // will register the stream with the AudioMirroringManager.
     EXPECT_CALL(*host_, OnStreamCreated(kStreamId, _))
         .WillOnce(QuitMessageLoop(message_loop_.get()));
+    EXPECT_CALL(mirroring_manager_,
+                AddDiverter(kRenderProcessId, kRenderViewId, NotNull()))
+        .RetiresOnSaturation();
 
     // Send a create stream message to the audio output stream and wait until
     // we receive the created message.
     host_->OnCreateStream(kStreamId,
+                          kRenderViewId,
                           media::AudioParameters(
                               media::AudioParameters::AUDIO_FAKE,
                               media::CHANNEL_LAYOUT_STEREO,
@@ -215,15 +221,6 @@ class AudioRendererHostTest : public testing::Test {
                               media::AudioParameters::kAudioCDSampleRate / 10));
     message_loop_->Run();
 
-    // Simulate the renderer process associating a stream with a render view.
-    EXPECT_CALL(mirroring_manager_,
-                RemoveDiverter(kRenderProcessId, MSG_ROUTING_NONE, _))
-        .RetiresOnSaturation();
-    EXPECT_CALL(mirroring_manager_,
-                AddDiverter(kRenderProcessId, kRenderViewId, NotNull()))
-        .RetiresOnSaturation();
-    host_->OnAssociateStreamWithProducer(kStreamId, kRenderViewId);
-    message_loop_->RunUntilIdle();
     // At some point in the future, a corresponding RemoveDiverter() call must
     // be made.
     EXPECT_CALL(mirroring_manager_,