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

content/renderer/media/media_stream_dependency_factory_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/memory/scoped_ptr.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_source_extra_data.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
@@ skipping 68 matching lines @@
       video_sources[0].setExtraData(
               new MediaStreamSourceExtraData(info));
     }
     WebKit::WebMediaStream stream_desc;
     stream_desc.initialize("media stream", audio_sources, video_sources);
 
     return stream_desc;
   }
 
   void CreateNativeSources(WebKit::WebMediaStream* descriptor) {
+    static const int kRenderViewId = 1;
+
     MediaSourceCreatedObserver observer;
     WebKit::WebMediaConstraints audio_constraints;
     dependency_factory_->CreateNativeMediaSources(
+        kRenderViewId,
         WebKit::WebMediaConstraints(),
         WebKit::WebMediaConstraints(),
         descriptor,
         base::Bind(
             &MediaSourceCreatedObserver::OnCreateNativeSourcesComplete,
             base::Unretained(&observer)));
 
     EXPECT_FALSE(observer.result());
     // Change the state of the created source to live. This should trigger
     // MediaSourceCreatedObserver::OnCreateNativeSourcesComplete
@@ skipping 80 matching lines @@
   EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack(
       stream_desc, video_tracks[0]));
   VerifyMediaStream(stream_desc, 1, 0);
 
   EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack(
       stream_desc, video_tracks[0]));
   VerifyMediaStream(stream_desc, 1, 1);
 }
 
 }  // namespace content