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

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
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) {

Powered by Google App Engine
This is Rietveld 408576698