content/renderer/media/user_media_client_impl_unittest.cc - Issue 1721273002: MediaStream audio object graph untangling and clean-ups.

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/user_media_client_impl_unittest.cc

Issue 1721273002: MediaStream audio object graph untangling and clean-ups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit tests broken by recent MSAudioTrack::Stop() reworking. Created 4 years, 10 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_audio_source.cc ('K') | « content/renderer/media/user_media_client_impl.cc ('k') | content/renderer/media/webaudio_capturer_source.h » ('j') | content/renderer/media/webrtc/media_stream_remote_audio_track.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/user_media_client_impl_unittest.cc

diff --git a/content/renderer/media/user_media_client_impl_unittest.cc b/content/renderer/media/user_media_client_impl_unittest.cc

index 36850f15737fe9e4d97510c36904b77b44b9f99f..0859d86dd3d9ac0e0c85faa1a62ced981745417e 100644

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

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

@@ -12,6 +12,7 @@

#include "base/strings/utf_string_conversions.h"

#include "content/child/child_process.h"

#include "content/renderer/media/media_stream.h"

+#include "content/renderer/media/media_stream_audio_source.h"

#include "content/renderer/media/media_stream_track.h"

#include "content/renderer/media/mock_media_stream_dispatcher.h"

#include "content/renderer/media/mock_media_stream_video_source.h"

@@ -284,8 +285,8 @@ TEST_F(UserMediaClientImplTest, GenerateTwoMediaStreamsWithSameSource) {

EXPECT_EQ(desc1_audio_tracks[0].source().id(),

desc2_audio_tracks[0].source().id());

- EXPECT_EQ(desc1_audio_tracks[0].source().getExtraData(),

- desc2_audio_tracks[0].source().getExtraData());

+ EXPECT_EQ(MediaStreamAudioSource::From(desc1_audio_tracks[0].source()),

+ MediaStreamAudioSource::From(desc2_audio_tracks[0].source()));

}

// Test that the same source object is not used if two MediaStreams are

@@ -314,8 +315,8 @@ TEST_F(UserMediaClientImplTest, GenerateTwoMediaStreamsWithDifferentSources) {

EXPECT_NE(desc1_audio_tracks[0].source().id(),

desc2_audio_tracks[0].source().id());

- EXPECT_NE(desc1_audio_tracks[0].source().getExtraData(),

- desc2_audio_tracks[0].source().getExtraData());

+ EXPECT_NE(MediaStreamAudioSource::From(desc1_audio_tracks[0].source()),

+ MediaStreamAudioSource::From(desc2_audio_tracks[0].source()));

}

TEST_F(UserMediaClientImplTest, StopLocalTracks) {