Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1874)

Unified Diff: content/renderer/media/media_stream_impl_unittest.cc

Issue 14346002: Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index 3cf0cc4a59b7c812025706118900ca919b75dc03..0a989fe48e81ad794ea68459855002692a76b29c 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -6,6 +6,7 @@
#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"
@@ -174,6 +175,9 @@ TEST_F(MediaStreamImplTest, LocalMediaStream) {
// 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 Medi
+ MediaStreamImpl::ReleaseSourceObservers(audio_desc);
+ MediaStreamImpl::ReleaseSourceObservers(video_desc);
}
// This test what happens if a source to a MediaSteam fails to start.
@@ -239,6 +243,7 @@ TEST_F(MediaStreamImplTest, StopStreamAfterReload) {
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

Powered by Google App Engine
This is Rietveld 408576698