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

Unified Diff: media/filters/decrypting_video_decoder_unittest.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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/decrypting_video_decoder.cc ('k') | media/filters/fake_demuxer_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder_unittest.cc
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index 19dda3d5e43239a67538db925dff4d411d05b3e5..cd9424ce4b8361e9c47e43cb71a181e8539be991 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -47,7 +47,7 @@ static scoped_refptr<DecoderBuffer> CreateFakeEncryptedBuffer() {
namespace {
ACTION_P(ReturnBuffer, buffer) {
- arg0.Run(buffer ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer);
+ arg0.Run(buffer.get() ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer);
}
ACTION_P(RunCallbackIfNotNull, param) {
@@ -116,7 +116,7 @@ class DecryptingVideoDecoderTest : public testing::Test {
const scoped_refptr<VideoFrame>& video_frame) {
if (status != VideoDecoder::kOk)
EXPECT_CALL(*this, FrameReady(status, IsNull()));
- else if (video_frame && video_frame->IsEndOfStream())
+ else if (video_frame.get() && video_frame->IsEndOfStream())
EXPECT_CALL(*this, FrameReady(status, IsEndOfStream()));
else
EXPECT_CALL(*this, FrameReady(status, video_frame));
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/fake_demuxer_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698