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

content/browser/renderer_host/media/audio_renderer_host_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/bind.h"
 #include "base/environment.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/sync_socket.h"
@@ skipping 183 matching lines @@
 
     io_thread_.reset();
     ui_thread_.reset();
   }
 
   void Create() {
     EXPECT_CALL(*observer_,
                 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,
                               media::AudioParameters::kAudioCDSampleRate, 16,
                               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_,
                 RemoveDiverter(kRenderProcessId, kRenderViewId, NotNull()))
         .RetiresOnSaturation();
 
     // Expect the audio stream will be deleted at some later point.
     EXPECT_CALL(*observer_, OnDeleteAudioStream(_, kStreamId));
   }
 
@@ skipping 150 matching lines @@
 TEST_F(AudioRendererHostTest, SimulateErrorAndClose) {
   Create();
   Play();
   SimulateError();
   Close();
 }
 
 // TODO(hclam): Add tests for data conversation in low latency mode.
 
 }  // namespace content