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

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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments and added tests. Created 6 years, 9 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/mock_media_stream_dependency_factory.cc
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index f934cce7e1c555c95e8d81fa76d41fb5effc31e2..628d5dcf07f71e8bafd11f4ad209b2959d14fe44 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -11,6 +11,7 @@
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
#include "content/renderer/media/webrtc_audio_capturer.h"
+#include "content/renderer/media/webrtc_local_audio_track.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
@@ -519,13 +520,16 @@ MockMediaStreamDependencyFactory::CreateIceCandidate(
scoped_refptr<WebRtcAudioCapturer>
MockMediaStreamDependencyFactory::CreateAudioCapturer(
int render_view_id, const StreamDeviceInfo& device_info,
- const blink::WebMediaConstraints& constraints) {
+ const blink::WebMediaConstraints& constraints,
+ MediaStreamAudioSource* audio_source) {
+ DCHECK(audio_source);
return WebRtcAudioCapturer::CreateCapturer(-1, device_info,
- constraints, NULL);
+ constraints, NULL, audio_source);
}
void MockMediaStreamDependencyFactory::StartLocalAudioTrack(
WebRtcLocalAudioTrack* audio_track) {
+ audio_track->Start();
return;
tommi (sloooow) - chröme 2014/04/03 08:53:16 nit: remove this line
perkj_chrome 2014/04/03 11:58:34 Done.
}

Powered by Google App Engine
This is Rietveld 408576698