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

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

Issue 503683003: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/webrtc* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/webrtc_audio_capturer.cc
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index 994f77b150c6887b2ffb6718ec6efe7c9d134ee9..301fc212c74432bf0f37272e5fa3a79ff1fbe373 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -264,7 +264,7 @@ void WebRtcAudioCapturer::AddTrack(WebRtcLocalAudioTrack* track) {
// Add with a tag, so we remember to call OnSetFormat() on the new
// track.
scoped_refptr<TrackOwner> track_owner(new TrackOwner(track));
- tracks_.AddAndTag(track_owner);
+ tracks_.AddAndTag(track_owner.get());
}
}
@@ -387,7 +387,7 @@ void WebRtcAudioCapturer::Start() {
DCHECK(thread_checker_.CalledOnValidThread());
DVLOG(1) << "WebRtcAudioCapturer::Start()";
base::AutoLock auto_lock(lock_);
- if (running_ || !source_)
+ if (running_ || !source_.get())
return;
// Start the data source, i.e., start capturing data from the current source.
@@ -554,8 +554,8 @@ void WebRtcAudioCapturer::OnCaptureError() {
media::AudioParameters WebRtcAudioCapturer::source_audio_parameters() const {
base::AutoLock auto_lock(lock_);
- return audio_processor_ ?
- audio_processor_->InputFormat() : media::AudioParameters();
+ return audio_processor_.get() ? audio_processor_->InputFormat()
+ : media::AudioParameters();
}
bool WebRtcAudioCapturer::GetPairedOutputParameters(
« no previous file with comments | « content/renderer/media/webrtc/webrtc_media_stream_adapter.cc ('k') | content/renderer/media/webrtc_audio_capturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698