content/renderer/media/media_stream_impl_unittest.cc - Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed review comments from xians. Created 6 years, 11 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

« content/renderer/media/media_stream_dependency_factory.cc ('K') | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/media_stream_source.h » ('j') | content/renderer/media/media_stream_video_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 644f2cd483d1d37513b3b1903ef3779c0f888ae1..49b8336fa6ad720887f4fd0e3d5759198f7ba964 100644

--- a/content/renderer/media/media_stream_impl_unittest.cc

+++ b/content/renderer/media/media_stream_impl_unittest.cc

@@ -53,7 +53,7 @@ class MediaStreamImplUnderTest : public MediaStreamImpl {

}

using MediaStreamImpl::OnLocalMediaStreamStop;

- using MediaStreamImpl::OnLocalSourceStop;

+ using MediaStreamImpl::OnLocalSourceStopped;

const blink::WebMediaStream& last_generated_stream() {

return last_generated_stream_;

@@ -236,14 +236,14 @@ TEST_F(MediaStreamImplTest, StopSource) {

// Stop the video source.

blink::WebVector<blink::WebMediaStreamTrack> video_tracks;

desc1.videoTracks(video_tracks);

- ms_impl_->OnLocalSourceStop(video_tracks[0].source());

+ ms_impl_->OnLocalSourceStopped(video_tracks[0].source());

EXPECT_EQ(0, ms_dispatcher_->stop_audio_device_counter());

EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter());

// Stop the audio source.

blink::WebVector<blink::WebMediaStreamTrack> audio_tracks;

desc1.audioTracks(audio_tracks);

- ms_impl_->OnLocalSourceStop(audio_tracks[0].source());

+ ms_impl_->OnLocalSourceStopped(audio_tracks[0].source());

EXPECT_EQ(1, ms_dispatcher_->stop_audio_device_counter());

EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter());

}