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

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 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
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 9e3c6a916daf07b144a529eb275d441b5297086f..1efb8c56304a4aedebd19282e8ed708f4ab32fa0 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -216,16 +216,16 @@ PipelineIntegrationTestBase::CreateFilterCollection(
base::Bind(&PipelineIntegrationTestBase::OnSetOpaque,
base::Unretained(this)),
!hashing_enabled_);
- collection->AddVideoRenderer(renderer_);
+ collection->AddVideoRenderer(renderer_.get());
audio_sink_ = new NullAudioSink();
if (hashing_enabled_)
audio_sink_->StartAudioHashForTesting();
scoped_refptr<AudioRendererImpl> audio_renderer(new AudioRendererImpl(
- audio_sink_));
+ audio_sink_.get()));
// Disable underflow if hashing is enabled.
if (hashing_enabled_)
audio_renderer->DisableUnderflowForTesting();
- collection->AddAudioRenderer(audio_renderer);
+ collection->AddAudioRenderer(audio_renderer.get());
return collection.Pass();
}
@@ -234,7 +234,7 @@ void PipelineIntegrationTestBase::OnVideoRendererPaint() {
return;
scoped_refptr<VideoFrame> frame;
renderer_->GetCurrentFrame(&frame);
- if (frame)
+ if (frame.get())
frame->HashFrameForTesting(&md5_context_);
renderer_->PutCurrentFrame(frame);
}
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698