Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

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 31 matching lines @@
   bool result_;
   WebKit::WebMediaStream* description_;
 };
 
 class MediaStreamDependencyFactoryTest : public ::testing::Test {
  public:
   virtual void SetUp() {
     dependency_factory_.reset(new MockMediaStreamDependencyFactory());
   }
 
+  virtual void TearDown() OVERRIDE {
+    // TODO(tommyw): Remove this once WebKit::MediaStreamSource::Owner has been
+    // implemented to fully avoid a circular dependency.
+    for (size_t i = 0; i < audio_sources_.size(); ++i)
+      audio_sources_[i].setExtraData(NULL);
+
+    for (size_t i = 0; i < video_sources_.size(); ++i)
+      video_sources_[i].setExtraData(NULL);
+  }
+
   WebKit::WebMediaStream CreateWebKitMediaStream(bool audio, bool video) {
     WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
         audio ? static_cast<size_t>(1) : 0);
     WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources(
         video ? static_cast<size_t>(1) : 0);
 
     if (audio) {
       StreamDeviceInfo info;
       info.device.type = content::MEDIA_DEVICE_AUDIO_CAPTURE;
       info.device.name = "audio";
       info.device.sample_rate = 0;
       info.device.channel_layout = 0;
       info.session_id = 99;
       audio_sources[0].initialize("audio",
                                   WebKit::WebMediaStreamSource::TypeAudio,
                                   "audio");
       audio_sources[0].setExtraData(
-              new MediaStreamSourceExtraData(info));
+          new MediaStreamSourceExtraData(info, audio_sources[0]));
+      audio_sources_.assign(audio_sources);
     }
     if (video) {
       StreamDeviceInfo info;
       info.device.type = content::MEDIA_DEVICE_VIDEO_CAPTURE;
       info.device.name = "video";
       info.session_id = 98;
       video_sources[0].initialize("video",
                                   WebKit::WebMediaStreamSource::TypeVideo,
                                   "video");
       video_sources[0].setExtraData(
-              new MediaStreamSourceExtraData(info));
+          new MediaStreamSourceExtraData(info, video_sources[0]));
+      video_sources_.assign(video_sources);
     }
     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;
 
@@ skipping 25 matching lines @@
     content::MediaStreamExtraData* extra_data =
         static_cast<content::MediaStreamExtraData*>(stream_desc.extraData());
     ASSERT_TRUE(extra_data && extra_data->stream());
     EXPECT_TRUE(extra_data->is_local());
     EXPECT_EQ(num_audio_tracks, extra_data->stream()->GetAudioTracks().size());
     EXPECT_EQ(num_video_tracks, extra_data->stream()->GetVideoTracks().size());
   }
 
  protected:
   scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_;
+  WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources_;
+  WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources_;
 };
 
 TEST_F(MediaStreamDependencyFactoryTest, CreateRTCPeerConnectionHandler) {
   MockWebRTCPeerConnectionHandlerClient client_jsep;
   scoped_ptr<WebKit::WebRTCPeerConnectionHandler> pc_handler(
       dependency_factory_->CreateRTCPeerConnectionHandler(&client_jsep));
   EXPECT_TRUE(pc_handler.get() != NULL);
 }
 
 TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) {
@@ skipping 49 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