Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

content/renderer/media/media_stream_impl_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"

[perkj_chrome, 2013/04/18 13:36:20]

Can you add a unit test to test that the WebKit source is changed here.

Inspiration can be found here:
https://codereview.chromium.org/14200016/

 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_impl.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_media_stream_dispatcher.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 
@@ skipping 148 matching lines @@
   // Stop generated local streams.
   ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ms_impl_->OnLocalMediaStreamStop(audio_desc.label().utf8());
   EXPECT_EQ(2, ms_dispatcher_->stop_stream_counter());
 
   // Test that the MediaStreams are deleted if the owning WebFrame is deleted.
   // In the unit test the owning frame is NULL.
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(3, ms_dispatcher_->stop_stream_counter());
+  MediaStreamImpl::ReleaseSourceObservers(mixed_desc);

[perkj_chrome, 2013/04/18 13:36:20]

You should not have to do this since you call
MediaStreamImpl::ReleaseSourceObservers from the ~UserMediaRequestInfo

Here and below

+  MediaStreamImpl::ReleaseSourceObservers(audio_desc);
+  MediaStreamImpl::ReleaseSourceObservers(video_desc);
 }
 
 // This test what happens if a source to a MediaSteam fails to start.
 TEST_F(MediaStreamImplTest, MediaSourceFailToStart) {
   ms_impl_->RequestUserMedia(true, true);
   FakeMediaStreamDispatcherComplete();
   ChangeVideoSourceStateToEnded();
   ChangeAudioSourceStateToEnded();
   EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_FAILED,
             ms_impl_->request_state());
@@ skipping 45 matching lines @@
 // This test what happens if stop is called on a stream after the frame has
 // been reloaded.
 TEST_F(MediaStreamImplTest, StopStreamAfterReload) {
   WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);
   EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());
   EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
+  MediaStreamImpl::ReleaseSourceObservers(mixed_desc);
 }
 
 }  // namespace content