Chromium Code Reviews| 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 8de0e2b43ddee0e639e89184c3f05d508a9e567a..a68f939e54333f4c5c27d0596b616fa5a650537a 100644 |
| --- a/content/renderer/media/mock_media_stream_dependency_factory.cc |
| +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc |
| @@ -455,10 +455,10 @@ MockMediaStreamDependencyFactory::CreateLocalAudioTrack( |
| webrtc::AudioSourceInterface* source, |
| const webrtc::MediaConstraintsInterface* constraints) { |
| DCHECK(mock_pc_factory_created_); |
| - DCHECK(!capturer.get()); |
| + scoped_refptr<WebRtcAudioCapturer> audio_capturer = capturer ? |
|
perkj_chrome
2014/01/12 21:53:06
This seem strange. Why don't you know if you must
no longer working on chromium
2014/01/13 16:59:59
Previously the capturer is got from WebRtcAudioDev
|
| + capturer : WebRtcAudioCapturer::CreateCapturer(-1, StreamDeviceInfo()); |
| return WebRtcLocalAudioTrack::Create( |
| - id, WebRtcAudioCapturer::CreateCapturer(), webaudio_source, |
| - source, constraints); |
| + id, audio_capturer, webaudio_source, source, constraints); |
| } |
| SessionDescriptionInterface* |
| @@ -478,9 +478,9 @@ MockMediaStreamDependencyFactory::CreateIceCandidate( |
| } |
| scoped_refptr<WebRtcAudioCapturer> |
| -MockMediaStreamDependencyFactory::MaybeCreateAudioCapturer( |
| +MockMediaStreamDependencyFactory::CreateAudioCapturer( |
| int render_view_id, const StreamDeviceInfo& device_info) { |
| - return WebRtcAudioCapturer::CreateCapturer(); |
| + return WebRtcAudioCapturer::CreateCapturer(-1, device_info); |
| } |
| } // namespace content |